From a7538780c749168835167a8d30aa65779c89407a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 18 Apr 2022 03:02:01 +0000 Subject: CTAN sync 202204180302 --- support/TeX4ht/source/ChangeLog | 18 +++++++++++++ support/TeX4ht/source/tex4ht-4ht.tex | 45 +++++++++++++++++++++++++++----- support/TeX4ht/source/tex4ht-html4.tex | 4 +-- support/TeX4ht/source/tex4ht-mathjax.tex | 8 +++--- 4 files changed, 63 insertions(+), 12 deletions(-) (limited to 'support/TeX4ht') diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index fdef1c98b9..49638165eb 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,8 +1,26 @@ +2022-04-17 Michal Hoftich + + * tex4ht-4ht.tex (xcolor.4ht), + * tex4ht-html4.tex (html4.4ht): fixed support for blended color + declarations in the form of `green!80!black`. + https://tex.stackexchange.com/a/641075/2891 + +2022-04-14 Michal Hoftich + + * tex4ht-4ht.tex (latex.4ht): fixed support for \labelformat in + sections. + https://puszcza.gnu.org.ua/bugs/?559 + * tex4ht-4ht.tex (hyperref.4ht): added supporting code for TeX4ht + from hyperref.sty. + https://puszcza.gnu.org.ua/bugs/?559 + 2022-04-13 Michal Hoftich * tex4ht-4ht.tex (latex.4ht): added support for the \Ref command. + https://puszcza.gnu.org.ua/bugs/?559 * tex4ht-4ht.tex (latex.4ht,nameref.4ht): added support for the \ref* command. + https://puszcza.gnu.org.ua/bugs/?559 2022-04-05 Michal Hoftich diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 86cf26ae1b..73fc7351a1 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1110 2022-04-13 14:59:07Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1113 2022-04-17 10:39:05Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -1543,7 +1543,7 @@ name which is provided in the parameter of \''\cur:lbl'. \<<< \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 |\expandafter}\:currentlabel} >>> @@ -1554,7 +1554,8 @@ name which is provided in the parameter of \''\cur:lbl'. \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 @@ -1738,6 +1739,7 @@ Example \ref{E} |% \xdef\cur:th{|\last:haddr}% |% + \xdef\:currentlabel{#2}% \edef\:SecAnchor{\cur:th\:currentlabel}% } >>> @@ -1753,7 +1755,7 @@ of entries as \''\Alph'. 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 >>> @@ -5506,6 +5508,35 @@ The following fix is to hold hypertex from modifying the links in \catcode`\:=11 >>> +The following code was originally placed directly in hyperref.sty. +We moved it here, so Hyperref don't need to contain specific +TeX4ht code. + +\<<< +\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 +}% + +>>> + %%%%%%%%%%%%%%%%%%%%%%%%% \SubSection{Forms} %%%%%%%%%%%%%%%%%%%%%% @@ -27074,8 +27105,10 @@ fragments. %\expandafter\ifx \csname HColor!#1\endcsname\relax \let\HColor=\relax |% - \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{% diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex index ba40def116..95b77afb6b 100644 --- a/support/TeX4ht/source/tex4ht-html4.tex +++ b/support/TeX4ht/source/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 1106 2022-04-04 10:06:26Z michal_h21 $ +% $Id: tex4ht-html4.tex 1113 2022-04-17 10:39:05Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -16042,7 +16042,7 @@ Blue = 1-minimum(1,Yellow *(1-Black)+Black) {\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{}} >>> diff --git a/support/TeX4ht/source/tex4ht-mathjax.tex b/support/TeX4ht/source/tex4ht-mathjax.tex index 730a778fce..1afcb7ecbe 100644 --- a/support/TeX4ht/source/tex4ht-mathjax.tex +++ b/support/TeX4ht/source/tex4ht-mathjax.tex @@ -1,7 +1,7 @@ -% $Id: tex4ht-mathjax.tex 1098 2022-03-24 22:18:43Z michal_h21 $ +% $Id: tex4ht-mathjax.tex 1107 2022-04-04 14:44:55Z karl $ % compile: latex tex4ht-mathjax % -% Copyright 2018-2021 TeX Users Group +% Copyright 2018-2022 TeX Users Group % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -18,8 +18,8 @@ \input{tex4ht-cpright} \<<< -% mathjax-latex-4ht.sty (|version), generated from |jobname.tex -% Copyright 2018-2021 TeX Users Group +% mathjax-latex-4ht.4ht (|version), generated from |jobname.tex +% Copyright 2018-2022 TeX Users Group | | | -- cgit v1.2.3