From fae4167e434a635ec0607a2d256d34f94a1d25e3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 9 Apr 2019 17:07:06 +0000 Subject: [x]color.4ht fixes, tex4ht r550 git-svn-id: svn://tug.org/texlive/trunk@50884 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/color.4ht | 50 +++++++++++-------------- Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht | 18 +++------ 2 files changed, 26 insertions(+), 42 deletions(-) diff --git a/Master/texmf-dist/tex/generic/tex4ht/color.4ht b/Master/texmf-dist/tex/generic/tex4ht/color.4ht index 482adc8c094..92565593b4c 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/color.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/color.4ht @@ -1,31 +1,22 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% color.4ht 2009-05-21-09:32 % -% Copyright (C) 1997--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% 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 % -% 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".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - +% color.4ht (2019-04-09-10:06), generated from tex4ht-4ht.tex +% Copyright 1997-2009 Eitan M. Gurari +% Copyright 2009-2019 TeX Users Group +% +% This work may be distributed and/or modified under the +% 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 +% 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 . +% +% If you modify this program, changing the +% version identification would be appreciated. \expandafter\ifx \csname color:def\endcsname\relax \let\color:def\def \else \expandafter\endinput\fi @@ -87,7 +78,8 @@ \expandafter\global\expandafter\let\csname CLR:#2\endcsname\empty \else #1\fi }} \def\get:HColor#1 #2//{% - \expandafter\ifx \csname HColor:#1\endcsname\relax + \if\relax#2\relax + % \expandafter\ifx \csname HColor:#1\endcsname\relax \let\HColor=\relax \expandafter\ifx \csname\string\color @#1\endcsname \relax\else \expandafter\ifx \csname colortyp:\endcsname\relax \else diff --git a/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht b/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht index dfa0b877ad3..5152eecacd3 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht @@ -1,6 +1,6 @@ -% colortbl.4ht (2017-04-28-08:47), generated from tex4ht-4ht.tex +% xcolor.4ht (2019-04-09-10:06), generated from tex4ht-4ht.tex % Copyright 2007-2009 Eitan M. Gurari -% Copyright 2009-2017 TeX Users Group +% Copyright 2009-2019 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 2017-04-28-08:47} +\immediate\write-1{version 2019-04-09-10:06} \input color.4ht \def\rowc@l@rs[#1]#2#3#4% @@ -54,19 +54,11 @@ \HLet\color@block\:temp \def\:temp#1#2#3{} \HLet\boxframe\:temp -\let\XC:definec@lor\XC@definec@lor -\def\XC@definec@lor[#1]#2[#3]#4#5{% - \expandafter\ifx\csname HColor!#2\endcsname\relax\else - \csname HColor!#4\endcsname #3!//% - \edef\:temp{{HColor}{#1}{\HColor}}% - \expandafter\Configure\:temp - \fi - \XC:definec@lor[#1]{#2}[#3]{#4}{#5}% -} \def\strip:fin:excl#1!{#1} \expandafter\def\csname get!HColor\endcsname#1!#2//{% \def\current:color:name{#1\if!#2!\else!\strip:fin:excl#2\fi}% - \expandafter\ifx \csname HColor!#1\endcsname\relax + \if\relax#2\relax + %\expandafter\ifx \csname HColor!#1\endcsname\relax \let\HColor=\relax \expandafter\ifx \csname\string\color @#1\endcsname \relax\else \expandafter\ifx \csname colortyp:\endcsname\relax \else -- cgit v1.2.3