[tex4ht-commits] [SCM] tex4ht updated: r1531 - trunk/lit

[Michal Hoftich]

Author: michal_h21
Date: 2024-06-17 19:40:15 +0000 (Mon, 17 Jun 2024)
New Revision: 1531

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
Log:
fixed rowspan and colspan with tabularray

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2024-06-16 14:55:08 UTC (rev 1530)
+++ trunk/lit/ChangeLog	2024-06-17 19:40:15 UTC (rev 1531)
@@ -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/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2024-06-16 14:55:08 UTC (rev 1530)
+++ trunk/lit/tex4ht-4ht.tex	2024-06-17 19:40:15 UTC (rev 1531)
@@ -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}{}