texlive[71603] Master/texmf-dist: fix conflict between arydshln and

commits+karl at tug.org commits+karl at tug.org
Sun Jun 23 22:57:17 CEST 2024


Revision: 71603
          https://tug.org/svn/texlive?view=revision&revision=71603
Author:   karl
Date:     2024-06-23 22:57:17 +0200 (Sun, 23 Jun 2024)
Log Message:
-----------
fix conflict between arydshln and colortbl, tex4ht r1535

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

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/arydshln.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-06-23 20:28:05 UTC (rev 71602)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2024-06-23 20:57:17 UTC (rev 71603)
@@ -1,5 +1,15 @@
 2024-06-21  Michal Hoftich  <michal.h21 at gmail.com>
 
+	* tex4ht-4ht.tex (arydshln.4ht): fixed clash between Colortbl and
+	Arydshln packages.
+	https://tex.stackexchange.com/a/721185/2891
+
+2024-06-23  Karl Berry  <karl at freefriends.org>
+
+	* tex4ht-cpright.tex: https for urls.
+
+2024-06-21  Michal Hoftich  <michal.h21 at gmail.com>
+
 	* tex4ht-html4.tex (html4.4ht): don't use picture name as alt in
 	\epsfbox, it can lead to spurious characters in the resulting HTML.
 	Thanks to Rolf Brigola
@@ -15,7 +25,7 @@
 
 	* tex4ht-4ht.tex (tabularray.4ht): updated names of token lists that
 	holds rowspan and colspan.
-	https://tex.stackexchange.com/a/720800/2891
+	https://tex.stackexchange.com/a/720800/2891
 
 2024-06-15  Michal Hoftich  <michal.h21 at gmail.com>
 

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-06-23 20:28:05 UTC (rev 71602)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2024-06-23 20:57:17 UTC (rev 71603)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1532 2024-06-20 12:47:49Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1535 2024-06-23 20:28:31Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -11225,12 +11225,13 @@
 \<arydshln.4ht\><<<
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
 % arydshln.4ht (|version), generated from |jobname.tex 
-% Copyright 2022 TeX Users Group 
+% Copyright 2022-2024 TeX Users Group 
 |<TeX4ht license text|> 
 % this is a copy of code that arydshln inserts to \@array
 \def\:new:array{\adl at everyvbox\everyvbox
         \everyvbox{\adl at arrayinit \the\adl at everyvbox \everyvbox\adl at everyvbox}%
-        \ifadl at inactive \adl at inactivate \else \adl at activate \fi
+        % this line may lead to errors if the document uses Colortbl:
+        % \ifadl at inactive \adl at inactivate \else \adl at activate \fi
         \let\adl at noalign\noalign}
 \ifcsname n:@array:\endcsname% if \@array was already patched by TeX4ht
   \let\orig:n at array\n:@array:

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht	2024-06-23 20:28:05 UTC (rev 71602)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/arydshln.4ht	2024-06-23 20:57:17 UTC (rev 71603)
@@ -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 at everyvbox\everyvbox
         \everyvbox{\adl at arrayinit \the\adl at everyvbox \everyvbox\adl at everyvbox}%
-        \ifadl at inactive \adl at inactivate \else \adl at activate \fi
+        % this line may lead to errors if the document uses Colortbl:
+        % \ifadl at inactive \adl at inactivate \else \adl at activate \fi
         \let\adl at noalign\noalign}
 \ifcsname n:@array:\endcsname% if \@array was already patched by TeX4ht
   \let\orig:n at array\n:@array:

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht	2024-06-23 20:28:05 UTC (rev 71602)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/babel-sty-hooks.4ht	2024-06-23 20:57:17 UTC (rev 71603)
@@ -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

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty	2024-06-23 20:28:05 UTC (rev 71602)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty	2024-06-23 20:57:17 UTC (rev 71603)
@@ -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,7 +9,7 @@
 % 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.
 %
@@ -16,11 +16,11 @@
 % 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



More information about the tex-live-commits mailing list.