Correct aux redef. for tabularray (fixes #760)

josephwright · Nov 19, 2024 · b514d20 · b514d20
1 parent 1610305
commit b514d20
Show file tree

Hide file tree

Showing 6 changed files with 376 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 
 ## [Unreleased]
 
+- Stack exhaustion with `tabularray` (see issue
+  [\#760](https://github.com/josephwright/siunitx/issues/760))
+
 ## [v3.3.23] - 2024-11-15
 
 ### Changed

diff --git a/siunitx-table.dtx b/siunitx-table.dtx
@@ -690,9 +690,6 @@
           {
             \cs_new_eq:NN
               \@@_align_auxiii:nn
-              \@@_align_auxii:nn
-            \cs_gset_eq:NN
-              \@@_align_auxii:nn
               \@@_align_auxi:nn
             \cs_gset_protected:Npn \@@_align_auxi:nn #1#2
               {

diff --git a/testfiles/siunitx-pkg-tabularray.luatex.tlg b/testfiles/siunitx-pkg-tabularray.luatex.tlg
@@ -38,13 +38,15 @@ Overfull \hbox (15.0pt too wide) in paragraph at lines 32--33
 ........\vbox(8.39996+3.60004)x102.46667, direction TLT
 .........\hbox(8.39996+3.60004)x102.46667, direction TLT
 ..........\vbox(6.44444+3.60004)x102.46667, direction TLT
-...........\hbox(6.44444+0.0)x102.46667, glue set 79.68883fill, direction TLT
+...........\hbox(6.44444+0.0)x102.46667, glue set 79.68883fil, direction TLT
 ............\localpar
 .............\localinterlinepenalty=0
 .............\localbrokenpenalty=0
 .............\localleftbox=null
 .............\localrightbox=null
 ............\hbox(0.0+0.0)x0.0, direction TLT
+............\glue 0.0 plus -0.5fill
+............\kern0.0
 ............\glue 0.0 plus 1.0fill
 ............\kern0.0
 ............\hbox(0.0+0.0)x0.0, direction TLT
@@ -65,6 +67,8 @@ Overfull \hbox (15.0pt too wide) in paragraph at lines 32--33
 .............\glue 0.0 plus 1.0fil
 ............\glue 0.0
 ............\kern0.0
+............\glue 0.0 plus -0.5fill
+............\kern0.0
 ............\penalty 10000
 ............\glue(\parfillskip) 0.0 plus 1.0fil
 ............\glue(\rightskip) 0.0
@@ -83,13 +87,15 @@ Overfull \hbox (15.0pt too wide) in paragraph at lines 32--33
 ........\vbox(8.39996+3.60004)x102.46667, direction TLT
 .........\hbox(8.39996+3.60004)x102.46667, direction TLT
 ..........\vbox(6.44444+3.60004)x102.46667, direction TLT
-...........\hbox(6.44444+0.0)x102.46667, glue set 79.68883fill, direction TLT
+...........\hbox(6.44444+0.0)x102.46667, glue set 79.68883fil, direction TLT
 ............\localpar
 .............\localinterlinepenalty=0
 .............\localbrokenpenalty=0
 .............\localleftbox=null
 .............\localrightbox=null
 ............\hbox(0.0+0.0)x0.0, direction TLT
+............\glue 0.0 plus -0.5fill
+............\kern0.0
 ............\glue 0.0 plus 0.5fill
 ............\kern0.0
 ............\hbox(0.0+0.0)x0.0, direction TLT
@@ -110,6 +116,8 @@ Overfull \hbox (15.0pt too wide) in paragraph at lines 32--33
 .............\glue 0.0 plus 1.0fil
 ............\glue 0.0 plus 0.5fill
 ............\kern0.0
+............\glue 0.0 plus -0.5fill
+............\kern0.0
 ............\penalty 10000
 ............\glue(\parfillskip) 0.0 plus 1.0fil
 ............\glue(\rightskip) 0.0
@@ -128,13 +136,15 @@ Overfull \hbox (15.0pt too wide) in paragraph at lines 32--33
 ........\vbox(8.39996+3.60004)x102.46667, direction TLT
 .........\hbox(8.39996+3.60004)x102.46667, direction TLT
 ..........\vbox(6.44444+3.60004)x102.46667, direction TLT
-...........\hbox(6.44444+0.0)x102.46667, glue set 79.68883fill, direction TLT
+...........\hbox(6.44444+0.0)x102.46667, glue set 79.68883fil, direction TLT
 ............\localpar
 .............\localinterlinepenalty=0
 .............\localbrokenpenalty=0
 .............\localleftbox=null
 .............\localrightbox=null
 ............\hbox(0.0+0.0)x0.0, direction TLT
+............\glue 0.0 plus -0.5fill
+............\kern0.0
 ............\glue 0.0
 ............\kern0.0
 ............\hbox(0.0+0.0)x0.0, direction TLT
@@ -155,6 +165,8 @@ Overfull \hbox (15.0pt too wide) in paragraph at lines 32--33
 .............\glue 0.0 plus 1.0fil
 ............\glue 0.0 plus 1.0fill
 ............\kern0.0
+............\glue 0.0 plus -0.5fill
+............\kern0.0
 ............\penalty 10000
 ............\glue(\parfillskip) 0.0 plus 1.0fil
 ............\glue(\rightskip) 0.0
@@ -240,7 +252,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 pop
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 538.94244fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 513.94513fil, direction TLT
 ...\write-{}
 ...\glue(\topskip) 0.0
 ...\hbox(10.5+5.5)x345.0, direction TLT
@@ -267,13 +279,15 @@ Completed box being shipped out [1]
 ...........\vbox(8.39996+3.60004)x102.46667, direction TLT
 ............\hbox(8.39996+3.60004)x102.46667, direction TLT
 .............\vbox(6.44444+3.60004)x102.46667, direction TLT
-..............\hbox(6.44444+0.0)x102.46667, glue set 79.68883fill, direction TLT
+..............\hbox(6.44444+0.0)x102.46667, glue set 79.68883fil, direction TLT
 ...............\localpar
 ................\localinterlinepenalty=0
 ................\localbrokenpenalty=0
 ................\localleftbox=null
 ................\localrightbox=null
 ...............\hbox(0.0+0.0)x0.0, direction TLT
+...............\glue 0.0 plus -0.5fill
+...............\kern0.0
 ...............\glue 0.0 plus 1.0fill
 ...............\kern0.0
 ...............\hbox(0.0+0.0)x0.0, direction TLT
@@ -294,6 +308,8 @@ Completed box being shipped out [1]
 ................\glue 0.0 plus 1.0fil
 ...............\glue 0.0
 ...............\kern0.0
+...............\glue 0.0 plus -0.5fill
+...............\kern0.0
 ...............\penalty 10000
 ...............\glue(\parfillskip) 0.0 plus 1.0fil
 ...............\glue(\rightskip) 0.0
@@ -312,13 +328,15 @@ Completed box being shipped out [1]
 ...........\vbox(8.39996+3.60004)x102.46667, direction TLT
 ............\hbox(8.39996+3.60004)x102.46667, direction TLT
 .............\vbox(6.44444+3.60004)x102.46667, direction TLT
-..............\hbox(6.44444+0.0)x102.46667, glue set 79.68883fill, direction TLT
+..............\hbox(6.44444+0.0)x102.46667, glue set 79.68883fil, direction TLT
 ...............\localpar
 ................\localinterlinepenalty=0
 ................\localbrokenpenalty=0
 ................\localleftbox=null
 ................\localrightbox=null
 ...............\hbox(0.0+0.0)x0.0, direction TLT
+...............\glue 0.0 plus -0.5fill
+...............\kern0.0
 ...............\glue 0.0 plus 0.5fill
 ...............\kern0.0
 ...............\hbox(0.0+0.0)x0.0, direction TLT
@@ -339,6 +357,8 @@ Completed box being shipped out [1]
 ................\glue 0.0 plus 1.0fil
 ...............\glue 0.0 plus 0.5fill
 ...............\kern0.0
+...............\glue 0.0 plus -0.5fill
+...............\kern0.0
 ...............\penalty 10000
 ...............\glue(\parfillskip) 0.0 plus 1.0fil
 ...............\glue(\rightskip) 0.0
@@ -357,13 +377,15 @@ Completed box being shipped out [1]
 ...........\vbox(8.39996+3.60004)x102.46667, direction TLT
 ............\hbox(8.39996+3.60004)x102.46667, direction TLT
 .............\vbox(6.44444+3.60004)x102.46667, direction TLT
-..............\hbox(6.44444+0.0)x102.46667, glue set 79.68883fill, direction TLT
+..............\hbox(6.44444+0.0)x102.46667, glue set 79.68883fil, direction TLT
 ...............\localpar
 ................\localinterlinepenalty=0
 ................\localbrokenpenalty=0
 ................\localleftbox=null
 ................\localrightbox=null
 ...............\hbox(0.0+0.0)x0.0, direction TLT
+...............\glue 0.0 plus -0.5fill
+...............\kern0.0
 ...............\glue 0.0
 ...............\kern0.0
 ...............\hbox(0.0+0.0)x0.0, direction TLT
@@ -384,6 +406,8 @@ Completed box being shipped out [1]
 ................\glue 0.0 plus 1.0fil
 ...............\glue 0.0 plus 1.0fill
 ...............\kern0.0
+...............\glue 0.0 plus -0.5fill
+...............\kern0.0
 ...............\penalty 10000
 ...............\glue(\parfillskip) 0.0 plus 1.0fil
 ...............\glue(\rightskip) 0.0
@@ -450,6 +474,101 @@ Completed box being shipped out [1]
 ....\penalty 10000
 ....\glue(\parfillskip) 0.0 plus 1.0fil
 ....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\parskip) 0.0
+...\glue(\lineskip) 1.0
+...\hbox(14.5+9.5)x345.0, glue set 244.32881fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\hbox(14.5+9.5)x85.67119, direction TLT
+.....\mathon
+.....\vbox(14.5+9.5)x85.67119, direction TLT
+......\hbox(8.39996+3.60004)x85.67119, direction TLT
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x17.56, glue set 0.56fill, direction TLT
+........\rule(8.39996+3.60004)x0.0
+........\glue 6.0
+........\rule(4.48+*)x0.0
+........\TU/lmr/m/n/10 a
+........\glue 0.0 plus 1.0fill
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x68.11119, glue set 11.66666fill, direction TLT
+........\glue 6.0
+........\rule(6.44444+*)x0.0
+........\glue 0.0 plus 0.5fill
+........\kern0.0
+........\glue 0.0 plus 0.5fill
+........\kern0.0
+........\hbox(6.44444+0.0)x15.00005, direction TLT
+.........\glue 0.0 plus 1.0fil
+.........\mathon
+.........\OT1/cmr/m/n/10 1
+.........\OT1/cmr/m/n/10 3
+.........\OT1/cmr/m/n/10 5
+.........\mathoff
+........\hbox(6.44444+0.0)x17.77783, direction TLT
+.........\mathon
+.........\OML/cmm/m/it/10 :
+.........\OT1/cmr/m/n/10 0
+.........\OT1/cmr/m/n/10 5
+.........\OT1/cmr/m/n/10 3
+.........\mathoff
+........\hbox(0.0+0.0)x0.0, direction TLT
+.........\glue 0.0 plus 1.0fil
+........\glue 0.0 plus 0.5fill
+........\kern0.0
+........\glue 0.0 plus 0.5fill
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+......\glue(\lineskip) 0.0
+......\hbox(8.39996+3.60004)x85.67119, direction TLT
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x17.56, direction TLT
+........\rule(8.39996+3.60004)x0.0
+........\glue 6.0
+........\rule(6.94+*)x0.0
+........\TU/lmr/m/n/10 b
+........\glue 0.0 plus 1.0fill
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+.......\hbox(8.39996+3.60004)x68.11119, direction TLT
+........\glue 6.0
+........\rule(6.44444+*)x0.0
+........\glue 0.0 plus 0.5fill
+........\kern0.0
+........\glue 0.0 plus 0.5fill
+........\kern0.0
+........\hbox(6.44444+0.0)x26.6667, glue set 21.66669fil, direction TLT
+.........\glue 0.0 plus 1.0fil
+.........\mathon
+.........\OT1/cmr/m/n/10 0
+.........\mathoff
+........\hbox(6.44444+0.0)x29.44449, direction TLT
+.........\mathon
+.........\OML/cmm/m/it/10 :
+.........\OT1/cmr/m/n/10 3
+.........\OT1/cmr/m/n/10 2
+.........\OT1/cmr/m/n/10 2
+.........\glue 1.66663
+.........\OT1/cmr/m/n/10 1
+.........\OT1/cmr/m/n/10 7
+.........\mathoff
+........\hbox(0.0+0.0)x0.0, direction TLT
+.........\glue 0.0 plus 1.0fil
+........\glue 0.0 plus 0.5fill
+........\kern0.0
+........\glue 0.0 plus 0.5fill
+........\glue 6.0
+.......\glue(\tabskip) 0.0
+.....\mathoff
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
 ...\glue -5.0
 ...\glue 0.0 plus 1.0fil
 ...\glue 0.0

diff --git a/testfiles/siunitx-pkg-tabularray.lvt b/testfiles/siunitx-pkg-tabularray.lvt
@@ -31,4 +31,9 @@
     1.1 & 2.2 & 3.3 \\
 \end{tblr}
 
+  \begin{tabular}{l S}
+	  a & 135.053 \\
+	  b & 0.32217
+  \end{tabular}
+
 \end{document}