From 71be4e33624a330058febb63c45b73794ad4e65e Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Mon, 12 Dec 2022 22:50:32 +0900
Subject: [PATCH] fix #46244

---
 src/patches/lltjp-siunitx.sty | 14 +++++++++++++-
 test/test26-siunitx.tex       | 34 ++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/patches/lltjp-siunitx.sty b/src/patches/lltjp-siunitx.sty
index fcc8922..16c13cd 100644
--- a/src/patches/lltjp-siunitx.sty
+++ b/src/patches/lltjp-siunitx.sty
@@ -1,5 +1,5 @@
 %
-% lltjp-siunitx.sty 2021-10-31
+% lltjp-siunitx.sty 2022-12-12
 %
 
 \NeedsTeXFormat{LaTeX2e}
@@ -34,6 +34,18 @@
 \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}
+      }
+    }
+  }
 }% siunitx v3.00 end
 {% siunitx v2.xx
 \cs_generate_variant:Nn \tl_if_in:NnT { coT }
diff --git a/test/test26-siunitx.tex b/test/test26-siunitx.tex
index cdff97f..8257df1 100644
--- a/test/test26-siunitx.tex
+++ b/test/test26-siunitx.tex
@@ -1,7 +1,8 @@
 \documentclass{scrbook}
-  %\usepackage{luatexja}
-  \usepackage{fontspec}
-  \usepackage{luatexja-fontspec}
+\usepackage{luatexja}
+\usepackage{tabularray}
+\usepackage{fontspec}
+%  \usepackage{luatexja-fontspec}
   \usepackage[
     mode=text,
     detect-all,
@@ -9,6 +10,10 @@
   %\usepackage{luatexja-fontspec}
 \makeatletter
 %\typeout{\meaning\@begindocumenthook}
+\usepackage{collcell}
+\newcolumntype{s}{>{\collectcell\si}c<{\endcollectcell}}
+\DeclareSIUnit\angstrom{Å}
+\UseTblrLibrary{siunitx}
 \begin{document}
   \ifdefined\gtfamily\gtfamily\fi Ω
   {\ExplSyntaxOn\makeatletter
@@ -17,16 +22,25 @@
   \SI{-2.5e-10}{mol.L^{-1}}\SI{1}{\micro\metre\angstrom\arcminute\arcsecond\ohm}
   \vrule\SI{}{\ohm}\vrule
 
- $\begin{array}{lSs}
+ \vrule$\begin{array}{Ss}
 %   \typeout{\meaning\@preamble}
-   a&-.123 & J.mol^{-1} \\
-   a&1.23e-3 & Hartree \\
+   -.123 & J.mol^{-1} \\
+   1.23e-3 & Hartree \\
   \end{array}$
 
-\begin{tabular}{lSs}
-%  \typeout{\meaning\@preamble}
-  a&-.123 & J.mol^{-1} \\
-  a&1.23e-3 & Hartree \\
+ \vrule\begin{tabular}{Ssl}
+  -.123 & J.mol^{-1} &「\\
+  1.23e-3 & Hartree & あ\\
+\end{tabular}
+
+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}
-- 
2.11.0