diff options
author | Karl Berry <karl@freefriends.org> | 2024-06-17 20:44:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-06-17 20:44:05 +0000 |
commit | afc82e896aef95f261375bfe6f5a77f1543d3791 (patch) | |
tree | 6ff812366aaf02ea3b04a79146630bdb17ae3a7b /Master/texmf-dist/source | |
parent | fb78ea0dbe5ee14b9b487d038346536e85846717 (diff) |
rowspan+colspan fix with tabularray, tex4ht r1531
git-svn-id: svn://tug.org/texlive/trunk@71552 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 08cc3090c36..dd7c62fc27e 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2024-06-17 Michal Hoftich <michal.h21@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@gmail.com> * tex4ht-4ht.tex (nameref.4ht): use \@currentlabelname if \NR:Title diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 8c5eca3dc91..0fd6e45cbaa 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -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 @@ We need to load the tabularx package, because we use it instead of Tabu for actu \<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 @@ for horizontal and vertical alignment, background color and rules. % find columns that are covered by rowspan and colspan \xdef\HCol{\@arabic\c@colnum} \xdef\HRow{\@arabic\c@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@rownum }{\c@rownum - 1 + \l__tblr_cell_rowspan_tl}{ - \int_step_inline:nnn{\c@colnum }{\c@colnum - 1 + \l__tblr_cell_colspan_tl}{ + \int_step_inline:nnn{\c@rownum }{\c@rownum - 1 + \lTblrCellRowSpanTl}{ + \int_step_inline:nnn{\c@colnum }{\c@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 @@ Handle circumflex catcodes when the \Verb|early^| option is used. \<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|> |