lltjp-siunitx.sty: \tablenum

diff --git a/src/patches/lltjp-siunitx.sty b/src/patches/lltjp-siunitx.sty
index 16c13cd..9c4526c 100644 (file)
--- a/src/patches/lltjp-siunitx.sty
+++ b/src/patches/lltjp-siunitx.sty
@@ -1,5 +1,5 @@
 %
-% lltjp-siunitx.sty 2022-12-12
+% lltjp-siunitx.sty 2022-12-14
 %
 
 \NeedsTeXFormat{LaTeX2e}
@@ -34,17 +34,15 @@
 \cs_set_eq:NN \ltj_orig__siunitx_table_collect_begin:w \__siunitx_table_collect_begin:w
 \cs_set_protected:Npn \__siunitx_table_collect_begin:w #1 \relax
   { \ltj_orig__siunitx_table_collect_begin:w }
-\AtBeginDocument{
-    \cs_if_exist:NT \TblrNum
-    { \RenewDocumentCommand \TblrNum { m }
-      {
-        \__tblr_siunitx_process:Nn
-          { \cs_set_eq:NN \__siunitx_table_collect_begin:w
-                          \ltj_orig__siunitx_table_collect_begin:w
-            \tablenum}
-          {#1}
-      }
-    }
+\RenewDocumentCommand \tablenum { O { } m }
+  {
+    \mode_leave_vertical:
+    \group_begin:
+      \keys_set:nn { siunitx } {#1}
+      \siunitx_cell_begin:w
+        \relax \ignorespaces #2
+      \siunitx_cell_end:
+    \group_end:
   }
 }% siunitx v3.00 end
 {% siunitx v2.xx

diff --git a/test/test26-siunitx.tex b/test/test26-siunitx.tex
index 8257df1..fbb9889 100644 (file)
--- a/test/test26-siunitx.tex
+++ b/test/test26-siunitx.tex
@@ -20,7 +20,13 @@
    \ttfamily\meaning\@begindocumenthook}
   
   \SI{-2.5e-10}{mol.L^{-1}}\SI{1}{\micro\metre\angstrom\arcminute\arcsecond\ohm}
-  \vrule\SI{}{\ohm}\vrule
+\vrule\SI{}{\ohm}\vrule
+
+\vrule
+\begin{tabular}{S}
+    0 \\   12345 \\   e3 \\   0.0+-0.1
+  \end{tabular}
+\vrule
 
  \vrule$\begin{array}{Ss}
 %   \typeout{\meaning\@preamble}
@@ -33,24 +39,17 @@
   1.23e-3 & Hartree & あ\\
 \end{tabular}
 
+\begin{tabular}{@{}llr@{}}
+  hogehoge&hogehoge&hogehoge\\
+  \multicolumn{2}{c}{\tablenum{1.246e-3}}&hoge\\
+  \multicolumn{2}{c}{\tablenum{-.362}}&hoge\\
+\end{tabular}
+
+\end{document}
 X\vrule\begin{tblr}{Ssl}
   -.123 & J.mol^{-1} &「\\
   1.23e-3 & Hartree & あ\\
 \end{tblr}
 
- \vrule\begin{tabular}{Ssl}
-  -.123 & J.mol^{-1} &「\\
-  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

diff --git a/test/test91-siunitx.tex b/test/test91-siunitx.tex
deleted file mode 100644 (file)
index e67c76e..0000000
--- a/test/test91-siunitx.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass{article}
-\usepackage{siunitx}
-\usepackage{luatexja}
-
-\begin{document}
-\SI{-2.5e-10}{mol.L^{-1}.\ohm.\angstrom''}
-
-
-\vrule
-\begin{tabular}{S}
-  0 \\   12345 \\   e3 \\   0.0+-0.1
-\end{tabular}
-\vrule
-\end{document}
-
-
-