diff options
author | Karl Berry <karl@freefriends.org> | 2024-06-23 20:57:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-06-23 20:57:17 +0000 |
commit | ab77fd2c3e6eec31e8b12904cf2ed72242372787 (patch) | |
tree | 6d15b2d39902279cab29a877201e58048f4b21fc /Master/texmf-dist/tex/generic | |
parent | 85dc4fdefa966a57f377594eceb47c5bc5042331 (diff) |
fix conflict between arydshln and colortbl, tex4ht r1535
git-svn-id: svn://tug.org/texlive/trunk@71603 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht b/Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht index 00ef03af65d..e597c71d11a 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% arydshln.4ht (2022-03-21-13:43), generated from tex4ht-4ht.tex -% Copyright 2022 TeX Users Group +% arydshln.4ht (2024-06-23-13:56), 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 @@ -17,12 +17,13 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-03-21-13:43} +\immediate\write-1{version 2024-06-23-13:56} % this is a copy of code that arydshln inserts to \@array \def\:new:array{\adl@everyvbox\everyvbox \everyvbox{\adl@arrayinit \the\adl@everyvbox \everyvbox\adl@everyvbox}% - \ifadl@inactive \adl@inactivate \else \adl@activate \fi + % this line may lead to errors if the document uses Colortbl: + % \ifadl@inactive \adl@inactivate \else \adl@activate \fi \let\adl@noalign\noalign} \ifcsname n:@array:\endcsname% if \@array was already patched by TeX4ht \let\orig:n@array\n:@array: diff --git a/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht index e3eebfddea4..dc4dcfb0753 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht @@ -1,5 +1,5 @@ % babel-sty-hooks.4ht, generated from tex4ht-4ht.tex -% Copyright 2022 TeX Users Group +% 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 2024-06-10-14:03} +\immediate\write-1{version 2024-06-20-13:26} \ifdefined\recall:sup \recall:sup diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty index 18a85e36ce7..82d1e3bc5e4 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty +++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty @@ -1,7 +1,7 @@ \ifnum\the\catcode`\%=14\else\expandafter\edef\csname \string:RestoreCatcodes\endcsname{\catcode`\%\the \catcode`\%}\catcode`\%14\fi -% tex4ht.sty (2024-05-06-13:36), generated from tex4ht-sty.tex +% tex4ht.sty (2024-06-23-13:56), generated from tex4ht-sty.tex % Copyright 2009-2024 TeX Users Group % Copyright 1996-2009 Eitan M. Gurari % @@ -9,18 +9,18 @@ % conditions of the LaTeX Project Public License, either % version 1.3c of this license or (at your option) any % later version. The latest version of this license is in -% http://www.latex-project.org/lppl.txt +% https://www.latex-project.org/lppl.txt % and version 1.3c or later is part of all distributions % of LaTeX version 2005/12/01 or later. % % This work has the LPPL maintenance status "maintained". % % The Current Maintainer of this work -% is the TeX4ht Project <http://tug.org/tex4ht>. +% is the TeX4ht Project <https://tug.org/tex4ht>. % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-05-06-13:36} +\immediate\write-1{version 2024-06-23-13:56} \ifx \Preamble\UnDef \else |