From de6b7de143aae945aeaa19a7c028f4207f5ae0ed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Apr 2022 16:37:29 +0000 Subject: blended colors, tex4ht r1113 (+ missed updates) git-svn-id: svn://tug.org/texlive/trunk@63055 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 6 ++--- Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht | 28 ++++++++++++++++++++--- Master/texmf-dist/tex/generic/tex4ht/latex.4ht | 16 +++++++------ Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht | 12 ++++++---- 4 files changed, 44 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index 661f4f6e9ea..22f2411d03e 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 (2022-04-04-07:07), generated from tex4ht-html4.tex +% html4.4ht (2022-04-17-09:34), generated from tex4ht-html4.tex % Copyright 2009-2022 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 2022-04-04-07:07} +\immediate\write-1{version 2022-04-17-09:34} \exit:ifnot{8859-6,% CJK,% @@ -28779,7 +28779,7 @@ Y{0178}\i{00EF}% {\gHAdvance\textcolorN by 1 \Configure{color}% {\Configure{SetHColor} - {\Css{span\#textcolor\textcolorN{color:\HColor}}}}% + {\ifx\HColor\@empty\else\Css{span\#textcolor\textcolorN{color:\HColor}}\fi}}% \HCode{}}% {\HCode{}} \Configure{colorbox} diff --git a/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht b/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht index 82ee19a7290..257d1262269 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/hyperref.4ht @@ -1,6 +1,6 @@ -% hyperref.4ht (2021-05-16-13:57), generated from tex4ht-4ht.tex +% hyperref.4ht (2022-04-14-13:38), generated from tex4ht-4ht.tex % Copyright 1999-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-16-13:57} +\immediate\write-1{version 2022-04-14-13:38} \csname end:hyperref\endcsname @@ -408,6 +408,28 @@ \def\@hyper@readexternallink#1#2#3#4:#5:#6\\#7{% \hyper@linkurl{#3}{#7\ifx\\#2\\\else\##2\fi}} \catcode`\:=11 +\def\T@pageref#1{% + \Hy@safe@activestrue% + \expandafter\@setref\csname r@#1\endcsname\@secondoffive{#1}% + \Hy@safe@activesfalse% +}% +\def\T@Ref#1{% + \Hy@safe@activestrue% + \let\olda:rEfLiNK\rEfLiNK%% + \def\rEfLiNK##1##2{\Link{##1}{}\edef\:ref:currentlabel{##2}\expandafter\MakeUppercase\:ref:currentlabel\EndLink}% + \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}% + \let\rEfLiNK\olda:rEfLiNK% + \Hy@safe@activesfalse% +}% +\def\@Refstar#1{% + \Hy@safe@activestrue + \let\olda:rEfLiNK\rEfLiNK%% + \def\rEfLiNK##1##2{\Link{##1}{}\edef\:ref:currentlabel{##2}\expandafter\MakeUppercase\:ref:currentlabel\EndLink}% + \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}% + \let\rEfLiNK\olda:rEfLiNK% + \Hy@safe@activesfalse +}% + \def\@Form[#1]{% \def\default:textarea{Form}% \scan:args{}#1,//\a:Form } diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht index 176b80528cd..0fb08052056 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht @@ -1,4 +1,4 @@ -% latex.4ht (2022-04-13-13:14), generated from tex4ht-4ht.tex +% latex.4ht (2022-04-14-13:38), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-04-13-13:14} +\immediate\write-1{version 2022-04-14-13:38} \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi @@ -455,14 +455,15 @@ \let\:currentlabel\empty \NewConfigure{@:currentlabel}[1]{\concat:config\a:@:currentlabel{#1}} \let\a:@:currentlabel\relax -\def\cur:lbl#1{{\a:@:currentlabel +\def\cur:lbl#1{{\let\saved:currentlabel\:currentlabel\a:@:currentlabel \def\:currentlabel{\par}% \ifx\@currentlabel\:currentlabel \def\:currentlabel{\let\:currentlabel\empty}% \else \def\:currentlabel{#1}% \edef\:currentlabel{\def\noexpand \:currentlabel{\ifx\:currentlabel\empty - \ifx \:@currentlabel\:UnDef \@currentlabel + \ifx \:@currentlabel\:UnDef + \ifx\saved:currentlabel \@currentlabel\@currentlabel\else\saved:currentlabel\fi \else \:@currentlabel \fi \else \expandafter\ifx\csname #1:Count\endcsname\relax @@ -2092,7 +2093,7 @@ $\vcenter XXI\or XXII\or XXIII\or XXIV\or XV\or XVI\else \expandafter\uppercase\expandafter{\romannumeral ##1}\fi}% \a:currentlabel - \edef\:temp{#2}\ifx \:temp\empty + \edef\:temp{\csname p@#1\expandafter\endcsname\csname the#1\endcsname}\ifx \:temp\empty \else \global\let\@currentlabel\:temp\fi \egroup % @@ -2100,6 +2101,7 @@ $\vcenter \let\:tempa\uppercase \def\uppercase##1{##1}\cur:lbl{}% \let\uppercase\:tempa % + \xdef\:currentlabel{#2}% \edef\:SecAnchor{\cur:th\:currentlabel}% } @@ -2306,7 +2308,7 @@ $\vcenter \expandafter\:temp\usepackage!*?: \def\:tempa{\@latex@e@error} \ifx \:temp\:tempa - % latex209.4ht (2022-04-13-13:14), generated from tex4ht-4ht.tex + % latex209.4ht (2022-04-14-13:38), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -2325,7 +2327,7 @@ $\vcenter % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-04-13-13:14} +\immediate\write-1{version 2022-04-14-13:38} \let\:fnsymbol\@fnsymbol \def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht b/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht index 5152eecacd3..18938c4376b 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/xcolor.4ht @@ -1,6 +1,6 @@ -% xcolor.4ht (2019-04-09-10:06), generated from tex4ht-4ht.tex +% xcolor.4ht (2022-04-17-09:34), generated from tex4ht-4ht.tex % Copyright 2007-2009 Eitan M. Gurari -% Copyright 2009-2019 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 2019-04-09-10:06} +\immediate\write-1{version 2022-04-17-09:34} \input color.4ht \def\rowc@l@rs[#1]#2#3#4% @@ -71,8 +71,10 @@ \space .!//% \fi \fi % - \else - \csname HColor!#1\endcsname #2//% + \else% + \ifcsname HColor!#1\endcsname% + \csname HColor!#1\endcsname #2//% + \fi% \fi } \expandafter\def\csname c:HColor!gray:\endcsname{% -- cgit v1.2.3