Skip to content

Commit

Permalink
set measure=vbox as default with varwidth library (#540)
Browse files Browse the repository at this point in the history
  • Loading branch information
lvjr committed Nov 30, 2024
1 parent d7a818c commit 9d911e2
Show file tree
Hide file tree
Showing 61 changed files with 62 additions and 59 deletions.
3 changes: 2 additions & 1 deletion tabularray.sty
Original file line number Diff line number Diff line change
Expand Up @@ -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:
{
Expand Down Expand Up @@ -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 }
}
Expand Down Expand Up @@ -7478,6 +7478,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 }
}
Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-001.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-002.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-003.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{tabularray}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-004.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{tabularray}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-005.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{tabularray}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-006.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-007.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\usepackage{multirow}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-008.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\ExplSyntaxOn
\let \replicate = \prg_replicate:nn
Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-009.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{tabularray}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\ExplSyntaxOn
\let \replicate = \prg_replicate:nn
Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-010.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{tabularray}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\ExplSyntaxOn
\let \replicate = \prg_replicate:nn
Expand Down
2 changes: 1 addition & 1 deletion testfiles/cell-011.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{tabularray}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}
\SetTblrInner{rowsep=0pt}

\begin{document}
Expand Down
1 change: 1 addition & 0 deletions testfiles/color-001.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
\SetTblrInner[tblr]{measure=hbox}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/color-002.tex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/color-003.tex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/color-004.tex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/color-005.tex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/extra-001.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\usepackage{environ}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/hvline-001.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/hvline-002.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/hvline-003.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}
\setlength\parindent{0pt}

\begin{document}
Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-001.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\usepackage{booktabs}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}
\UseTblrLibrary{booktabs}

\begin{document}
Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-002.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}
\UseTblrLibrary{diagbox}

\begin{document}
Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-003.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\usepackage{xcolor}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}
\UseTblrLibrary{siunitx}

\begin{document}
Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-004.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}
\UseTblrLibrary{siunitx}

\begin{document}
Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-005.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
\usepackage{array,multirow,booktabs}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-006.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-007.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-008.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-009.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-010.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{filecontents*}[overwrite]{test1.tmp}
Some & Some \\
Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-011.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-012.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-013.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\renewcommand\thetable{\arabic{section}.\arabic{subsection}.\arabic{table}}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/library-014.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
\usepackage{delarray}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/long-001.tex
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
\hypersetup{colorlinks}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/long-002.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
\usepackage{lmodern} % avoid using ec font

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/long-003.tex
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
\hypersetup{colorlinks}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/long-004.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
\hypersetup{colorlinks}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/long-005.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/long-006.tex
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
2 changes: 1 addition & 1 deletion testfiles/long-007.tex
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
\usepackage{array}

\SetTblrTracing{none}
\UseTblrLibrary{varwidth}
%\UseTblrLibrary{varwidth}

\begin{document}

Expand Down
Loading

0 comments on commit 9d911e2

Please sign in to comment.