texlive[71552] Master/texmf-dist: rowspan+colspan fix with

[commits+karl at tug.org]

Revision: 71552
          https://tug.org/svn/texlive?view=revision&revision=71552
Author:   karl
Date:     2024-06-17 22:44:05 +0200 (Mon, 17 Jun 2024)
Log Message:
-----------
rowspan+colspan fix with tabularray, tex4ht r1531

Revision Links:
--------------
    https://tug.org/svn/texlive?view=revision&revision=1531

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-06-17 20:11:59 UTC (rev 71551)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-06-17 20:44:05 UTC (rev 71552)
@@ -1,3 +1,9 @@
+2024-06-17  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (tabularray.4ht): updated names of token lists that
+	holds rowspan and colspan.
+	https://tex.stackexchange.com/a/720800/2891
+
 2024-06-15  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-4ht.tex (nameref.4ht): use \@currentlabelname if \NR:Title

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-06-17 20:11:59 UTC (rev 71551)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-06-17 20:44:05 UTC (rev 71552)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1529 2024-06-15 17:59:08Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1531 2024-06-17 19:40:15Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -11344,7 +11344,7 @@
 
 \<tabularray.4ht\><<< 
 % tabularray.4ht (|version), generated from |jobname.tex 
-% Copyright 2022-2023 TeX Users Group 
+% Copyright 2022-2024 TeX Users Group 
 |<TeX4ht license text|> 
 |<tabularray definitions|>
 |<tabularray table and rows|>
@@ -11450,13 +11450,13 @@
 % find columns that are covered by rowspan and colspan
   \xdef\HCol{\@arabic\c at colnum}
   \xdef\HRow{\@arabic\c at rownum}
-  \xdef\HMultispan{\l__tblr_cell_colspan_tl}
-  \xdef\HRowspan{\l__tblr_cell_rowspan_tl}
+  \xdef\HMultispan{\lTblrCellColSpanTl}
+  \xdef\HRowspan{\lTblrCellRowSpanTl}
   \let\CellAttributes\@empty
   \let\CellStyle\@empty
   % calculate ignored cells, if the current cell uses colspan or rowspan
-  \int_step_inline:nnn{\c at rownum }{\c at rownum - 1 + \l__tblr_cell_rowspan_tl}{
-    \int_step_inline:nnn{\c at colnum }{\c at colnum - 1  + \l__tblr_cell_colspan_tl}{
+  \int_step_inline:nnn{\c at rownum }{\c at rownum - 1 + \lTblrCellRowSpanTl}{
+    \int_step_inline:nnn{\c at colnum }{\c at colnum - 1  + \lTblrCellColSpanTl}{
       % the loop always matches the current cell, we must ignore it
       \str_if_eq:eeF{\HCol.\HRow}{####1.##1}{%
         \cs_gset:cpn{ignoredcell-####1-##1}{}
@@ -24951,7 +24951,7 @@
 
 \<babel-sty-hooks.4ht\><<<
 % babel-sty-hooks.4ht, generated from |jobname.tex
-% Copyright 2022 TeX Users Group
+% Copyright 2022-2024 TeX Users Group
 |<TeX4ht license text|>
 |<disable early sup|>
 |<babelfont|>

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht	2024-06-17 20:11:59 UTC (rev 71551)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht	2024-06-17 20:44:05 UTC (rev 71552)
@@ -1,5 +1,5 @@
-% tabularray.4ht (2023-10-25-13:45), generated from tex4ht-4ht.tex
-% Copyright 2022-2023 TeX Users Group
+% tabularray.4ht (2024-06-17-13:42), generated from tex4ht-4ht.tex
+% Copyright 2022-2024 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2023-10-25-13:45}
+\immediate\write-1{version 2024-06-17-13:42}
 
 \NewConfigure{tabularray}{8}
 \NewConfigure{tabularrayignoredcell}{2}
@@ -91,13 +91,13 @@
 % find columns that are covered by rowspan and colspan
   \xdef\HCol{\@arabic\c at colnum}
   \xdef\HRow{\@arabic\c at rownum}
-  \xdef\HMultispan{\l__tblr_cell_colspan_tl}
-  \xdef\HRowspan{\l__tblr_cell_rowspan_tl}
+  \xdef\HMultispan{\lTblrCellColSpanTl}
+  \xdef\HRowspan{\lTblrCellRowSpanTl}
   \let\CellAttributes\@empty
   \let\CellStyle\@empty
   % calculate ignored cells, if the current cell uses colspan or rowspan
-  \int_step_inline:nnn{\c at rownum }{\c at rownum - 1 + \l__tblr_cell_rowspan_tl}{
-    \int_step_inline:nnn{\c at colnum }{\c at colnum - 1  + \l__tblr_cell_colspan_tl}{
+  \int_step_inline:nnn{\c at rownum }{\c at rownum - 1 + \lTblrCellRowSpanTl}{
+    \int_step_inline:nnn{\c at colnum }{\c at colnum - 1  + \lTblrCellColSpanTl}{
       % the loop always matches the current cell, we must ignore it
       \str_if_eq:eeF{\HCol.\HRow}{####1.##1}{%
         \cs_gset:cpn{ignoredcell-####1-##1}{}