Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build
build
.DS_Store
18 changes: 13 additions & 5 deletions tabularray-dev.sty
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
\DeclareRelease{v2021}{2021-01-01}{tabularray-2021.sty}
\DeclareCurrentRelease{}{2026-01-01}

\ProvidesExplPackage{tabularray-dev}{2026-05-11}{2026A-DEV}
\ProvidesExplPackage{tabularray-dev}{2026-05-28}{2026A-DEV}
{Development and experimental variant of tabularray}

%% \IfFormatAtLeastTF, xparse and lthooks are added in LaTeX 2020-10-01
Expand Down Expand Up @@ -5612,10 +5612,18 @@
\prop_clear:N \l__tblr_column_min_width_prop
\int_step_variable:nNn { \c@colcount } \l__tblr_j_tl
{
\tl_set:Ne \l__tblr_min_tl
{ \prop_item:Ne \l__tblr_col_item_skip_size_prop { item[\l__tblr_j_tl] } }
\prop_put:Nee \l__tblr_column_min_width_prop
{ \l__tblr_j_tl } { \l__tblr_min_tl }
\tl_set:Ne \l__tblr_co_tl
{ \__tblr_data_item:nen { column } { \l__tblr_j_tl } { coefficient } }
\fp_compare:nNnTF { \l__tblr_co_tl } > { 0 }
{
\prop_put:Nen \l__tblr_col_item_skip_size_prop { item[\l__tblr_j_tl] } { 0pt }
}
{
\tl_set:Ne \l__tblr_min_tl
{ \prop_item:Ne \l__tblr_col_item_skip_size_prop { item[\l__tblr_j_tl] } }
\prop_put:Nee \l__tblr_column_min_width_prop
{ \l__tblr_j_tl } { \l__tblr_min_tl }
}
}
Comment thread
ponte-vecchio marked this conversation as resolved.
\prop_set_eq:NN \l__tblr_col_item_even_prop \l__tblr_col_item_skip_size_prop
\str_if_eq:enTF
Expand Down
1 change: 1 addition & 0 deletions testfiles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,4 @@
| `table-015` | empty tables (#326) |
| `table-016` | first cell starts with a square bracket (#598) |
| `table-017` | set horizontal alignment of longtblr with `\SetTblrOuter` (#611) |
| `table-018` | merged cells in non-X columns (#659) |
2 changes: 1 addition & 1 deletion testfiles/cell-005.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6da0b1c829c78ea57c29e1cfc3e5623e
ca1202ef9f687b517c2f4ed868860251
Binary file modified testfiles/cell-005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions testfiles/table-018.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fe43acdc67c99ddb15a832e442ed884f
8 changes: 8 additions & 0 deletions testfiles/table-018.pdftex.tlg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
============================================================
TEST 1: Test merged cells in non-X columns
============================================================
============================================================
[1
] (table-018.aux)
Binary file added testfiles/table-018.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions testfiles/table-018.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
\documentclass{article}
\input{regression-test}
\setlength{\parindent}{0pt}

\begin{document}
\START
\BEGINTEST{Test merged cells in non-X columns}
\begin{tblr}{
colspec = {lllXX},
hlines,
vlines,
}
1-1 & 1-2 & 1-3 & very very long text in the X column & sooooooooooooo very much long it will not stop and continue \\
2-1 & 2-2 & 2-3 & 2-4 & 2-5 \\
\end{tblr}
\begin{tblr}{
colspec = {lllXX},
hlines,
vlines,
}
1-1 & \SetCell[c=2]{c} merged & 1-3 & very very long text in the X column & sooooooooooooo very much long it will not stop and continue \\
2-1 & 2-2 & 2-3 & 2-4 & 2-5 \\
\end{tblr}
\begin{tblr}{
colspec = {llrXX},
Comment thread
ponte-vecchio marked this conversation as resolved.
hlines,
vlines,
}
1-1 & 1-2 & \SetCell[c=2]{c} merged & very very long text in the X column & sooooooooooooo very much long it will not stop and continue \\
2-1 & 2-2 & 2-3 & 2-4 & 2-5 \\
\end{tblr}
\ENDTEST
\end{document}
8 changes: 8 additions & 0 deletions testfiles/table-018.tlg
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
============================================================
TEST 1: Test merged cells in non-X columns
============================================================
============================================================
[1
] (table-018.aux)
Loading