diff options
author | Karl Berry <karl@freefriends.org> | 2021-12-01 21:09:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-12-01 21:09:38 +0000 |
commit | 61a8302a1531f7061c2376108ddf4decd165dd02 (patch) | |
tree | e6910f0ac635471c90ee964e103f39db9c7fcbd9 /Master/texmf-dist | |
parent | 6772b29c795ab21ab01360e0f9c68349a2091371 (diff) |
tabularray (1dec21)
git-svn-id: svn://tug.org/texlive/trunk@61200 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/tabularray/tabularray.pdf | bin | 760493 -> 760910 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/tabularray/tabularray.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tabularray/tabularray.sty | 19 |
3 files changed, 15 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf b/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf Binary files differindex 450375620e7..1a21a9f22ac 100644 --- a/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf +++ b/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf diff --git a/Master/texmf-dist/doc/latex/tabularray/tabularray.tex b/Master/texmf-dist/doc/latex/tabularray/tabularray.tex index bda64717b4b..c2fddc1e36f 100644 --- a/Master/texmf-dist/doc/latex/tabularray/tabularray.tex +++ b/Master/texmf-dist/doc/latex/tabularray/tabularray.tex @@ -1,7 +1,7 @@ % -*- coding: utf-8 -*- % !TEX program = lualatex \documentclass[oneside]{book} -\newcommand*{\myversion}{2021P} +\newcommand*{\myversion}{2021Q} \newcommand*{\mylpad}[1]{\ifnum#1<10 0\the#1\else\the#1\fi} \usepackage[a4paper,margin=2.5cm]{geometry} diff --git a/Master/texmf-dist/tex/latex/tabularray/tabularray.sty b/Master/texmf-dist/tex/latex/tabularray/tabularray.sty index db63c63a3c8..f5ad547d716 100644 --- a/Master/texmf-dist/tex/latex/tabularray/tabularray.sty +++ b/Master/texmf-dist/tex/latex/tabularray/tabularray.sty @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\ProvidesExplPackage{tabularray}{2021-10-01}{2021P} +\ProvidesExplPackage{tabularray}{2021-12-01}{2021Q} {Typeset tabulars and arrays with LaTeX3} \RequirePackage{xparse} @@ -114,6 +114,12 @@ \int_new:N \c@rowcount \int_new:N \c@colcount +%% Add missing \therownum, \thecolnum, \therowcount, \thecolcount (issue #129) +\NewExpandableDocumentCommand \therownum {} { \@arabic \c@rownum } +\NewExpandableDocumentCommand \thecolnum {} { \@arabic \c@colnum } +\NewExpandableDocumentCommand \therowcount {} { \@arabic \c@rowcount } +\NewExpandableDocumentCommand \thecolcount {} { \@arabic \c@colcount } + %% Some dimensions for row and column spacing \dim_new:N \abovesep \dim_new:N \belowsep @@ -2679,9 +2685,12 @@ } %% Decrease row count by 1 if the last row has only one empty cell text %% We need to do it here since the > or < column type may add text to cells - \bool_lazy_and:nnTF - { \int_compare_p:nNn {\c@colnum} = {1} } - { \tl_if_empty_p:N \l_tmpa_tl } + \bool_lazy_all:nTF + { + { \int_compare_p:nNn {#1} = {\c@rowcount} } + { \int_compare_p:nNn {\c@colnum} = {1} } + { \tl_if_empty_p:N \l_tmpa_tl } + } { \int_decr:N \c@rowcount } { \__tblr_prop_gput:nnx @@ -4661,7 +4670,7 @@ \tl_if_empty:NT \l__tblr_caption_short_tl { \tl_set:Nx \l__tblr_caption_short_tl { \InsertTblrText { caption } } } \addcontentsline { lot } { table } - { \protect\numberline { \arabic { table } } { \l__tblr_caption_short_tl } } + { \protect\numberline { \thetable } { \l__tblr_caption_short_tl } } } \SetTblrTemplate { caption-lot } { normal } |