texlive[61200] Master/texmf-dist: tabularray (1dec21)

[commits+karl at tug.org]

Revision: 61200
          http://tug.org/svn/texlive?view=revision&revision=61200
Author:   karl
Date:     2021-12-01 22:09:38 +0100 (Wed, 01 Dec 2021)
Log Message:
-----------
tabularray (1dec21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf
    trunk/Master/texmf-dist/doc/latex/tabularray/tabularray.tex
    trunk/Master/texmf-dist/tex/latex/tabularray/tabularray.sty

Modified: trunk/Master/texmf-dist/doc/latex/tabularray/tabularray.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/tabularray/tabularray.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tabularray/tabularray.tex	2021-12-01 21:09:22 UTC (rev 61199)
+++ trunk/Master/texmf-dist/doc/latex/tabularray/tabularray.tex	2021-12-01 21:09:38 UTC (rev 61200)
@@ -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}

Modified: trunk/Master/texmf-dist/tex/latex/tabularray/tabularray.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tabularray/tabularray.sty	2021-12-01 21:09:22 UTC (rev 61199)
+++ trunk/Master/texmf-dist/tex/latex/tabularray/tabularray.sty	2021-12-01 21:09:38 UTC (rev 61200)
@@ -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 at rowcount
 \int_new:N \c at colcount
 
+%% Add missing \therownum, \thecolnum, \therowcount, \thecolcount (issue #129)
+\NewExpandableDocumentCommand \therownum {} { \@arabic \c at rownum }
+\NewExpandableDocumentCommand \thecolnum {} { \@arabic \c at colnum }
+\NewExpandableDocumentCommand \therowcount {} { \@arabic \c at rowcount }
+\NewExpandableDocumentCommand \thecolcount {} { \@arabic \c at 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 at colnum} = {1} }
-      { \tl_if_empty_p:N \l_tmpa_tl }
+    \bool_lazy_all:nTF
+      {
+        { \int_compare_p:nNn {#1} = {\c at rowcount} }
+        { \int_compare_p:nNn {\c at colnum} = {1} }
+        { \tl_if_empty_p:N \l_tmpa_tl }
+      }
       { \int_decr:N \c at 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 }