Merge branch 'main' into issue179

lvjr · Dec 1, 2024 · eb268d2 · eb268d2
2 parents 486cccd + 9d911e2
commit eb268d2
Show file tree

Hide file tree

Showing 61 changed files with 62 additions and 59 deletions.
diff --git a/tabularray.sty b/tabularray.sty
@@ -3056,6 +3056,7 @@
   }
 
 \tl_new:N \l__tblr_inner_spec_measure_tl
+\tl_set:Nn \l__tblr_inner_spec_measure_tl { hbox }
 
 \cs_new_protected:Npn \__tblr_init_table_inner_spec:
   {
@@ -3103,7 +3104,6 @@
         \__tblr_spec_gput:nen { vline }
           { [\int_eval:n { \c@colcount + 1}] / ##1 } {##2}
       }
-    \tl_clear:N \l__tblr_inner_spec_measure_tl
     \keys_set:nv { tblr } { l__tblr_default_ \l__tblr_env_name_tl _inner_tl }
   }
 
@@ -7483,6 +7483,7 @@
   {
     \RequirePackage { varwidth }
     \clist_gput_left:Nn \g__tblr_table_known_keys_clist { measure }
+    \tl_set:Nn \l__tblr_inner_spec_measure_tl { vbox }
     \keys_define:nn { tblr } { measure .tl_set:N = \l__tblr_inner_spec_measure_tl }
   }
 

diff --git a/testfiles/cell-001.tex b/testfiles/cell-001.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/cell-002.tex b/testfiles/cell-002.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/cell-003.tex b/testfiles/cell-003.tex
@@ -8,7 +8,7 @@
 \usepackage{tabularray}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/cell-004.tex b/testfiles/cell-004.tex
@@ -8,7 +8,7 @@
 \usepackage{tabularray}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/cell-005.tex b/testfiles/cell-005.tex
@@ -8,7 +8,7 @@
 \usepackage{tabularray}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/cell-006.tex b/testfiles/cell-006.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/cell-007.tex b/testfiles/cell-007.tex
@@ -9,7 +9,7 @@
 \usepackage{multirow}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/cell-008.tex b/testfiles/cell-008.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \ExplSyntaxOn
 \let \replicate = \prg_replicate:nn

diff --git a/testfiles/cell-009.tex b/testfiles/cell-009.tex
@@ -8,7 +8,7 @@
 \usepackage{tabularray}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \ExplSyntaxOn
 \let \replicate = \prg_replicate:nn

diff --git a/testfiles/cell-010.tex b/testfiles/cell-010.tex
@@ -8,7 +8,7 @@
 \usepackage{tabularray}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \ExplSyntaxOn
 \let \replicate = \prg_replicate:nn

diff --git a/testfiles/cell-011.tex b/testfiles/cell-011.tex
@@ -8,7 +8,7 @@
 \usepackage{tabularray}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 \SetTblrInner{rowsep=0pt}
 
 \begin{document}

diff --git a/testfiles/color-001.tex b/testfiles/color-001.tex
@@ -11,6 +11,7 @@
 
 \SetTblrTracing{none}
 \UseTblrLibrary{varwidth}
+\SetTblrInner[tblr]{measure=hbox}
 
 \begin{document}
 

diff --git a/testfiles/color-002.tex b/testfiles/color-002.tex
@@ -10,7 +10,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/color-003.tex b/testfiles/color-003.tex
@@ -10,7 +10,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/color-004.tex b/testfiles/color-004.tex
@@ -10,7 +10,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/color-005.tex b/testfiles/color-005.tex
@@ -10,7 +10,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/extra-001.tex b/testfiles/extra-001.tex
@@ -9,7 +9,7 @@
 \usepackage{environ}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/hvline-001.tex b/testfiles/hvline-001.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/hvline-002.tex b/testfiles/hvline-002.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/hvline-003.tex b/testfiles/hvline-003.tex
@@ -9,7 +9,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 \setlength\parindent{0pt}
 
 \begin{document}

diff --git a/testfiles/library-001.tex b/testfiles/library-001.tex
@@ -9,7 +9,7 @@
 \usepackage{booktabs}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 \UseTblrLibrary{booktabs}
 
 \begin{document}

diff --git a/testfiles/library-002.tex b/testfiles/library-002.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 \UseTblrLibrary{diagbox}
 
 \begin{document}

diff --git a/testfiles/library-003.tex b/testfiles/library-003.tex
@@ -9,7 +9,7 @@
 \usepackage{xcolor}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 \UseTblrLibrary{siunitx}
 
 \begin{document}

diff --git a/testfiles/library-004.tex b/testfiles/library-004.tex
@@ -8,7 +8,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 \UseTblrLibrary{siunitx}
 
 \begin{document}

diff --git a/testfiles/library-005.tex b/testfiles/library-005.tex
@@ -12,7 +12,7 @@
 \usepackage{array,multirow,booktabs}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/library-006.tex b/testfiles/library-006.tex
@@ -12,7 +12,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/library-007.tex b/testfiles/library-007.tex
@@ -11,7 +11,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/library-008.tex b/testfiles/library-008.tex
@@ -12,7 +12,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/library-009.tex b/testfiles/library-009.tex
@@ -11,7 +11,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/library-010.tex b/testfiles/library-010.tex
@@ -11,7 +11,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{filecontents*}[overwrite]{test1.tmp}
 Some & Some \\

diff --git a/testfiles/library-011.tex b/testfiles/library-011.tex
@@ -11,7 +11,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/library-012.tex b/testfiles/library-012.tex
@@ -11,7 +11,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/library-013.tex b/testfiles/library-013.tex
@@ -11,7 +11,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \renewcommand\thetable{\arabic{section}.\arabic{subsection}.\arabic{table}}
 

diff --git a/testfiles/library-014.tex b/testfiles/library-014.tex
@@ -12,7 +12,7 @@
 \usepackage{delarray}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/long-001.tex b/testfiles/long-001.tex
@@ -13,7 +13,7 @@
 \hypersetup{colorlinks}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/long-002.tex b/testfiles/long-002.tex
@@ -12,7 +12,7 @@
 \usepackage{lmodern} % avoid using ec font
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/long-003.tex b/testfiles/long-003.tex
@@ -13,7 +13,7 @@
 \hypersetup{colorlinks}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/long-004.tex b/testfiles/long-004.tex
@@ -11,7 +11,7 @@
 \hypersetup{colorlinks}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/long-005.tex b/testfiles/long-005.tex
@@ -9,7 +9,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/long-006.tex b/testfiles/long-006.tex
@@ -9,7 +9,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}
 

diff --git a/testfiles/long-007.tex b/testfiles/long-007.tex
@@ -10,7 +10,7 @@
 \usepackage{array}
 
 \SetTblrTracing{none}
-\UseTblrLibrary{varwidth}
+%\UseTblrLibrary{varwidth}
 
 \begin{document}