diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-03 21:53:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-03 21:53:50 +0000 |
commit | 8ea6d3f1b5089ae779b34b8e47768a28731f6274 (patch) | |
tree | 545c86c41cc03febf2ea43d9ff977075ad8c7c2f /Master | |
parent | 217c1e16d9b316f60167942777fd1aff14dea424 (diff) |
\arrayrulecolor outside tabular, tex4ht r1165
git-svn-id: svn://tug.org/texlive/trunk@63804 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht | 12 |
3 files changed, 21 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 7f361c46d9b..c01b437555c 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2022-07-03 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (colortbl.4ht): fixed error when \arrayrulecolor is + used outside of Tabular. + https://tex.stackexchange.com/a/649734/2891 + 2022-07-01 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (hyperref.4ht): fixed handling of undefined diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index bd8a32515b1..e5c61d58e4a 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 1164 2022-07-01 14:16:09Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1165 2022-07-03 18:18:19Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -27773,14 +27773,18 @@ need also a treatment similar to \''\CT@column@color'? \NewConfigure{rowcolor}{1} >>> -Fixes for colored hlines +Fixes for colored hlines. The \`|\hline:color| can be used in CSS, for instance. \<fix colortbl\><<< % default hline color is black \def\hline:color{000} % save rule color in format usable in CSS \newcommand\tmp:arrayrulecolor[2][named]{% -\noalign{\convertcolorspec{#1}{#2}{HTML}\:tmp\global\let\hline:color\:tmp}% +\ifvoid\@arstrutbox% test if we are inside a tabular environment +\convertcolorspec{#1}{#2}{HTML}\:tmp\global\let\hline:color\:tmp% we are not +\else% +\noalign{\convertcolorspec{#1}{#2}{HTML}\:tmp\global\let\hline:color\:tmp}% we are +\fi } \HLet\arrayrulecolor\tmp:arrayrulecolor >>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht index 5b954cc8ff1..50543a2b952 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/colortbl.4ht @@ -1,6 +1,6 @@ -% colortbl.4ht (2021-05-06-14:12), generated from tex4ht-4ht.tex +% colortbl.4ht (2022-07-03-14:21), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2022 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-05-06-14:12} +\immediate\write-1{version 2022-07-03-14:21} \RequirePackage{xcolor} @@ -99,7 +99,11 @@ \def\hline:color{000} % save rule color in format usable in CSS \newcommand\tmp:arrayrulecolor[2][named]{% -\noalign{\convertcolorspec{#1}{#2}{HTML}\:tmp\global\let\hline:color\:tmp}% +\ifvoid\@arstrutbox% test if we are inside a tabular environment +\convertcolorspec{#1}{#2}{HTML}\:tmp\global\let\hline:color\:tmp% we are not +\else% +\noalign{\convertcolorspec{#1}{#2}{HTML}\:tmp\global\let\hline:color\:tmp}% we are +\fi } \HLet\arrayrulecolor\tmp:arrayrulecolor \def\convert:colorspec#1 #2 #3 #4{% |