From 011ed6123a0f52728468a0f53fb423119c90d2c6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Oct 2023 20:45:59 +0000 Subject: row id attrs, tex4ht r1398 git-svn-id: svn://tug.org/texlive/trunk@68652 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 5 +++++ Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 4 ++-- Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex | 4 ++-- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 6 +++--- Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht | 6 +++--- 5 files changed, 15 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 4dd692e4a74..9ac2a7d02da 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,8 @@ +2023-10-25 Michal Hoftich + + * tex4ht-4ht.tex (tabularray.4ht), + * tex4ht-html4.tex (html4.4ht): fixed row id attributes. + 2023-10-24 Michal Hoftich * tex4ht-4ht.tex (latex.4ht): make the \@wrindex command robust. diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 4a3036cffd5..720483836c0 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 1397 2023-10-24 19:39:36Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1398 2023-10-25 20:40:50Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2023 TeX Users Group @@ -11121,7 +11121,7 @@ Insert basic tags for table and rows } \HLet\__tblr_environ_code:nnnn\:tempa -\long\def\:tempa#1{\xdef\HRow{\@arabic\c@rownum}\c:tabularray\o:__tblr_build_row:N:{#1}\d:tabularray} +\long\def\:tempa#1{\int_set:Nn \c@rownum {#1}\xdef\HRow{\@arabic\c@rownum}\c:tabularray\o:__tblr_build_row:N:{#1}\d:tabularray} \HLet\__tblr_build_row:N\:tempa \ExplSyntaxOff >>> diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 0d10aaf33ea..f3a61fa3449 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 1396 2023-10-20 16:07:23Z michal_h21 $ +% $Id: tex4ht-html4.tex 1398 2023-10-25 20:40:50Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -2249,7 +2249,7 @@ We mainly need to handle paragraphs. \gHAdvance\Next:TableNo by 1 \global\let\TableNo=\Next:TableNo% \HCode{} }{\ifvmode\IgnorePar\fi\EndP\HCode{
}} -{\HCode{}}{\HCode{}} +{\HCode{}}{\HCode{}} {\HCode{}}{\HCode{}} {\Configure{tabularrayattributes}{rowspan="\HRowspan"}} {\Configure{tabularrayattributes}{colspan="\HMultispan"}}{} diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 2b1f970fbc0..a7c066d6bb1 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2023-10-20-09:24), generated from tex4ht-html4.tex +% html4.4ht (2023-10-25-13:45), generated from tex4ht-html4.tex % Copyright 2009-2023 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-10-20-09:24} +\immediate\write-1{version 2023-10-25-13:45} \exit:ifnot{8859-6,% CJK,% @@ -30881,7 +30881,7 @@ description">}% \gHAdvance\Next:TableNo by 1 \global\let\TableNo=\Next:TableNo% \HCode{} }{\ifvmode\IgnorePar\fi\EndP\HCode{
}} -{\HCode{}}{\HCode{}} +{\HCode{}}{\HCode{}} {\HCode{}}{\HCode{}} {\Configure{tabularrayattributes}{rowspan="\HRowspan"}} {\Configure{tabularrayattributes}{colspan="\HMultispan"}}{} diff --git a/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht b/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht index c8c653f28eb..72b80122e0a 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/tabularray.4ht @@ -1,4 +1,4 @@ -% tabularray.4ht (2023-10-12-14:41), generated from tex4ht-4ht.tex +% tabularray.4ht (2023-10-25-13:45), generated from tex4ht-4ht.tex % Copyright 2022-2023 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,7 +16,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-10-12-14:41} +\immediate\write-1{version 2023-10-25-13:45} \NewConfigure{tabularray}{8} \NewConfigure{tabularrayignoredcell}{2} @@ -41,7 +41,7 @@ } \HLet\__tblr_environ_code:nnnn\:tempa -\long\def\:tempa#1{\xdef\HRow{\@arabic\c@rownum}\c:tabularray\o:__tblr_build_row:N:{#1}\d:tabularray} +\long\def\:tempa#1{\int_set:Nn \c@rownum {#1}\xdef\HRow{\@arabic\c@rownum}\c:tabularray\o:__tblr_build_row:N:{#1}\d:tabularray} \HLet\__tblr_build_row:N\:tempa \ExplSyntaxOff -- cgit v1.2.3