Fix #38720

diff --git a/src/patches/lltjp-siunitx.sty b/src/patches/lltjp-siunitx.sty
index d629fd3..3c7569e 100644 (file)
--- a/src/patches/lltjp-siunitx.sty
+++ b/src/patches/lltjp-siunitx.sty
@@ -1,10 +1,11 @@
 %
-% lltjp-siunitx.sty 2018-08-24
+% lltjp-siunitx.sty 2018-11-02
 %
 
 \NeedsTeXFormat{LaTeX2e}
 
 \RequirePackage{luatexja}
+\makeatletter
 \ExplSyntaxOn
 \cs_generate_variant:Nn \tl_if_in:NnT { coT }
 \cs_new:Nn \__ltj_siunix_patch_inner:n {
@@ -26,5 +27,48 @@
   \__ltj_siunix_patch_inner_math:n { arcsecond }
   \__ltj_siunix_patch_inner_math:n { ohm }
 }
+
+%%%% new table column: S and s
+\cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
+  {
+    \token_if_eq_meaning:NNF #1 \relax {
+    \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
+    \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
+    \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
+      {
+        \token_if_eq_meaning:NNF #1 \tex_unskip:D
+          { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+      }
+       }}}
+    \__siunitx_table_collect_next:
+  }
+
+\AtBeginDocument
+  {
+    \@ifpackageloaded { mdwtab }
+      {
+        \cs_set_protected:Npn \__siunitx_table_collect_not_braced:N #1
+          {
+            \token_if_eq_meaning:NNF #1 \relax {
+            \token_if_eq_meaning:NNF #1 \ltjfakeboxbdd {
+            \token_if_eq_meaning:NNF #1 \pltx@next@inhibitglue {
+            \token_if_eq_meaning:NNF #1 \tex_ignorespaces:D
+              {
+                \token_if_eq_meaning:NNF #1 \tex_unskip:D
+                  {
+                    \token_if_eq_meaning:NNF #1 \tab@setcr
+                      {
+                        \token_if_eq_meaning:NNF #1 \@maybe@unskip
+                          { \__siunitx_table_collect_not_braced_aux_i:N #1 }
+                      }
+                  }
+              }
+            }}}
+            \__siunitx_table_collect_next:
+          }
+      }
+      { }
+  }
+
 \ExplSyntaxOff
 \endinput

diff --git a/test/test26-siunitx.tex b/test/test26-siunitx.tex
index 07a6ca4..cdff97f 100644 (file)
--- a/test/test26-siunitx.tex
+++ b/test/test26-siunitx.tex
@@ -8,7 +8,7 @@
 ]{siunitx}
   %\usepackage{luatexja-fontspec}
 \makeatletter
-\typeout{\meaning\@begindocumenthook}
+%\typeout{\meaning\@begindocumenthook}
 \begin{document}
   \ifdefined\gtfamily\gtfamily\fi Ω
   {\ExplSyntaxOn\makeatletter
@@ -16,4 +16,27 @@
   
   \SI{-2.5e-10}{mol.L^{-1}}\SI{1}{\micro\metre\angstrom\arcminute\arcsecond\ohm}
   \vrule\SI{}{\ohm}\vrule
-  \end{document}
\ No newline at end of file
+
+ $\begin{array}{lSs}
+%   \typeout{\meaning\@preamble}
+   a&-.123 & J.mol^{-1} \\
+   a&1.23e-3 & Hartree \\
+  \end{array}$
+
+\begin{tabular}{lSs}
+%  \typeout{\meaning\@preamble}
+  a&-.123 & J.mol^{-1} \\
+  a&1.23e-3 & Hartree \\
+\end{tabular}
+
+\end{document}
+
+
+LTJ
+\d@llarbegin \__siunitx_table_collect_begin:Nn S{}\relax
+\pltx@next@inhibitglue \ltjfakeboxbdd \ignorespaces
+\@sharp \unskip \ltjfakeboxbdd \__siunitx_table_print:\relax \d@llarend
+
+non-LTJ
+\d@llarbegin \__siunitx_table_collect_begin:Nn S{}
+\ignorespaces \@sharp \unskip \__siunitx_table_print:\relax \d@llarend