blended colors, tex4ht r1113 (+ missed updates)

git-svn-id: svn://tug.org/texlive/trunk@63055 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2022-04-17 16:37:29 +0000
committer: Karl Berry <karl@freefriends.org> 2022-04-17 16:37:29 +0000
commit: de6b7de143aae945aeaa19a7c028f4207f5ae0ed (patch)
tree: b435541f22473b57525a5873df58cbb583426205
parent: 9001150bd19ce22ee5766798bae6c40f415cc506 (diff)
8 files changed, 107 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index fdef1c98b94..49638165ebd 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,8 +1,26 @@
+2022-04-17  Michal Hoftich  <michal.h21@gmail.com>
+
+	* 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  <michal.h21@gmail.com>
+
+	* 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  <michal.h21@gmail.com>
 
 	* 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  <michal.h21@gmail.com>
 
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 86cf26ae1bb..73fc7351a1a 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 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'.
 \<cross ref\><<<
 \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 
   |<body of cur:lbl|>\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}
    |</edef /@currentlabel|>%
    \xdef\cur:th{|<haddr prefix|>\last:haddr}%
    |<get :currentlabel|>%
+   \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.
+
+\<config hyperref\><<<
+\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
      |<xcolor from def|>%
-  \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/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index ba40def116e..95b77afb6b4 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/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{<span id="textcolor\textcolorN">}}%
    {\HCode{</span>}}
 >>>
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
index 730a778fce7..1afcb7ecbe1 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/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\><<<
-% 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
 |<TeX4ht copywrite|>
 |<required packages|>
 |<defined commands|>
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{<span id="textcolor\textcolorN">}}%
    {\HCode{</span>}}
 \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{%
author	Karl Berry <karl@freefriends.org>	2022-04-17 16:37:29 +0000
committer	Karl Berry <karl@freefriends.org>	2022-04-17 16:37:29 +0000
commit	de6b7de143aae945aeaa19a7c028f4207f5ae0ed (patch)
tree	b435541f22473b57525a5873df58cbb583426205
parent	9001150bd19ce22ee5766798bae6c40f415cc506 (diff)