\arrayrulecolor via \HLet, tex4ht r925-926;

menukeys support, tex4ht r927;
accent fixes for Spanish babel, tex4ht r928-929;
fontawesome5, tex4ht r931-932.


git-svn-id: svn://tug.org/texlive/trunk@59107 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 148 insertions, 34 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/extra-bin/vcss b/Master/texmf-dist/source/generic/tex4ht/extra-bin/vcss
index af3a4e4bec2..af3a4e4bec2 100755..100644
--- a/Master/texmf-dist/source/generic/tex4ht/extra-bin/vcss
+++ b/Master/texmf-dist/source/generic/tex4ht/extra-bin/vcss
diff --git a/Master/texmf-dist/source/generic/tex4ht/extra-bin/xmllint b/Master/texmf-dist/source/generic/tex4ht/extra-bin/xmllint
index af3a4e4bec2..af3a4e4bec2 100755..100644
--- a/Master/texmf-dist/source/generic/tex4ht/extra-bin/xmllint
+++ b/Master/texmf-dist/source/generic/tex4ht/extra-bin/xmllint
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index f3db98f2e41..47c8e40bce7 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 921 2021-05-02 17:08:51Z karl $
+% $Id: tex4ht-4ht.tex 933 2021-05-06 21:38:57Z karl $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2021 TeX Users Group    
@@ -3796,6 +3796,69 @@ fonts which results in compilation failure.
 \:dontusepackage{newcomputermodern}
 >>> \AddFile{9}{newcomputermodern-hooks}
 
+\<add to usepackage\><<<
+\Configure{PackageHooks}{newcomputermodern.sty}{newcomputermodern-hooks.4ht}
+>>>
+
+%%%%%%%%%%%%%%%%%
+\Section{fontawesome}
+%%%%%%%%%%%%%%%%%
+
+We need to prevent use of OpenType fonts with Fontawesome5 package.
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{fontawesome5-utex-helper.sty}%
+{fontawesome5-utex-helper-hooks.4ht}
+\Configure{PackageHooks}{fontawesome5.sty}{fontawesome5-hooks.4ht}
+>>>
+
+This file prevents loading of OpenType fonts that are loaded automatically
+when LuaLaTeX or XeLaTeX are used. It loads Type 1 fonts instead.
+
+\<fontawesome5-utex-helper-hooks.4ht\><<<
+% fontawesome5-utex-helper-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht license text|>
+\:dontusepackage{fontawesome5-utex-helper}
+\RequirePackage{fontawesome5-generic-helper}
+\endinput
+>>> \AddFile{9}{fontawesome5-utex-helper-hooks}
+
+It seems that catcode of : character is wrongly set after end of this package
+when we use package hooks. It is probably because of some Expl3 catcode
+checks. We need to reset the catcode manually. 
+
+\<fontawesome5-hooks.4ht\><<<
+% fontawesome5-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht license text|>
+\:AtEndOfPackage{\catcode`\:=12}
+\endinput
+>>> \AddFile{9}{fontawesome5-hooks}
+
+Finally, we can provide some configuration for Fontawesome itself. It turns all
+icons to pictures by TeX4ht conversion.
+
+\<fontawesome5.4ht\><<<
+% fontawesome5.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht license text|>
+\NewConfigure{fontawesome}{2}
+\ExplSyntaxOn
+\cs_new_protected:Nn\temp:nn{%
+\a:fontawesome%
+\o:fontawesome_use_icon:nn:{#1}{#2}
+\b:fontawesome}
+
+\HLet\fontawesome_use_icon:nn\temp:nn
+\ExplSyntaxOff
+\Configure{fontawesome}{\Picture+{}}{\EndPicture}
+\Hinput{fontawesome5}
+\endinput
+>>> \AddFile{9}{fontawesome5}
+
+
+
 %%%%%%%%%%%%%%%%%
 \Section{biblatex}
 %%%%%%%%%%%%%%%%%
@@ -4843,7 +4906,7 @@ We can load nameref from the early hook file
 \<hyperref-hooks.4ht\><<<
 % hyperref-hooks.4ht (|version), generated from |jobname.tex
 % Copyright 2021 TeX Users Group
-|<TeX4ht copyright|>
+|<TeX4ht license text|>
 \:AtEndOfPackage{%
 \@ifpackageloaded{nameref}{}
 {%
@@ -26808,6 +26871,18 @@ need also a treatment similar to \''\CT@column@color'?
 \NewConfigure{rowcolor}{1}
 >>>
 
+Fixes for colored hlines
+
+\<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}%
+}
+\HLet\arrayrulecolor\tmp:arrayrulecolor
+>>>
+
 \SubSection{Utilities}
 
 This should enable use of \`|\color| command in array declaration
@@ -31538,7 +31613,7 @@ We must fix some exerquiz issues before we load the package itself.
 \<exerquiz-hooks.4ht\><<<
 % exerquiz-hooks.4ht (|version), generated from |jobname.tex
 % Copyright 2021 TeX Users Group
-|<TeX4ht copywrite|>
+|<TeX4ht license text|>
 \ifdefined\headerps@out\else%
 \def\headerps@out#1{}%
 \fi
@@ -31885,6 +31960,41 @@ of \''\:temp' below.
 \Configure{chessboard}{\Picture*{}\Save:TikzPict}{\Restore:TikzPict\EndPicture}
 >>> \AddFile{9}{chessboard}
 
+%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{menukeys.sty}
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+\<menukeys.4ht\><<<
+% menukeys.4ht (|version), generated from |jobname.tex
+% Copyright 2021 TeX Users Group
+|<TeX4ht license text|>
+% use the following Configuration to patch all defined styles (not commands!)
+\NewConfigure{defmenukey}[1]{%
+  % define \Configure{menukey<stylename>} - it will be used to insert \Picture+ ... \EndPicture
+  \NewConfigure{menukey#1}{2}
+  % insert hooks into style's pre and post macros
+  \expandafter\pend:def\csname tw@style@#1@pre\endcsname{\csname a:menukey#1\endcsname}%
+  \expandafter\append:def\csname tw@style@#1@post\endcsname{\csname b:menukey#1\endcsname}%
+  % use pictures by default for the style configuration
+  \Configure{menukey#1}{\Picture*{}}{\EndPicture}
+}
+
+\Configure{defmenukey}{menus}
+\Configure{defmenukey}{paths}
+\Configure{defmenukey}{roundedkeys}
+\Configure{defmenukey}{roundedmenus}
+\Configure{defmenukey}{angularmenus}
+\Configure{defmenukey}{typewriterkeys}
+\Configure{defmenukey}{hyphenatepaths}
+\Configure{defmenukey}{pathswithfolder}
+\Configure{defmenukey}{shadowedangularkeys}
+\Configure{defmenukey}{pathswithblackfolder}
+\Configure{defmenukey}{hyphenatepathswithfolder}
+\Configure{defmenukey}{hyphenatepathswithblackfolder}
+
+\Hinput{menukeys}
+\endinput
+>>> \AddFile{9}{menukeys}
 
 %%%%%%%%%%%%%%%%%%%%%%%%
 \Section{vanilla.sty}
@@ -38363,10 +38473,9 @@ The following is needed to compensate for the extra \''\relax\space' in
 >>>
 
 \<spanish defs\><<< 
-\let\:tempc\es@accent
-\pend:defIII\:tempc{%
+\def\:tempc#1#2#3{%
     \expandafter\:text@composite@x
-    \csname OT1\string##1\endcsname##3\@empty}
+    \csname OT1\string#1\endcsname#3\@empty}
 \HLet\es@accent\:tempc
 \def\:text@composite@x#1#2{%
    \expandafter\ifx \csname \string#1-\string#2\endcsname\relax
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index 897d6394956..fd6ae865e91 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 920 2021-04-30 15:45:20Z michal_h21 $
+% $Id: tex4ht-html4.tex 928 2021-05-04 17:53:52Z michal_h21 $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -748,7 +748,7 @@ tex4ht-body>>>
 \Configure{subsection}{}{}
    {\ifvmode \IgnorePar\fi
     \EndP\bgroup \IgnorePar\HCode{<h4 class="subsectionHead"\a:LRdir>}%
-    \TitleMark~~\HtmlParOff}
+    \TitleMark\ \ \HtmlParOff}
    {\HCode{</h4>}\HtmlParOn \IgnoreIndent\egroup\par\ShowPar}
 \Configure{likesubsection}{}{}{\EndP\bgroup
    \ifvmode \IgnorePar\fi
@@ -1812,7 +1812,7 @@ should be used whe addcontentline instructions are present.
 
 \<html latex tocs\><<<
 \def\tocpart#1#2#3{\par
-   \HCode{<span class="partToc" \a:LRdir>}\if !#1!\else  #1~~\fi #2\HCode{</span>}\par}%
+   \HCode{<span class="partToc" \a:LRdir>}\if !#1!\else  #1\ \ \fi #2\HCode{</span>}\par}%
 \def\toclikepart#1#2#3{\par
    \HCode{<span class="likepartToc" \a:LRdir>}#2\HCode{</span>}\par}%
 |<part toc css|>%
@@ -1872,7 +1872,7 @@ should be used whe addcontentline instructions are present.
 \<scr report,book\><<<
 \def\tocpart#1#2#3{\par
    \HCode{<span class="partToc" \a:LRdir>}\if !#1!\else  
-                                   #1~~\fi #2\HCode{</span>}\par}%
+                                   #1\ \ \fi #2\HCode{</span>}\par}%
 \def\toclikepart#1#2#3{\par
    \HCode{<span class="likepartToc" \a:LRdir>}#2\HCode{</span>}\par}%
 \Css{.partToc a, .partToc, .likepartToc a, .likepartToc
@@ -1881,13 +1881,13 @@ should be used whe addcontentline instructions are present.
         .appendixToc a, .appendixToc, .addchapToc a
         {line-height: 200\%; font-weight:bold;}}
    \def\tocchapter#1#2#3{\par
-      \HCode{<span class="chapterToc" \a:LRdir>}#1~~#2\HCode{</span>}\par}
+      \HCode{<span class="chapterToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
    \def\toclikechapter#1#2#3{\par
       \HCode{<span class="likechapterToc" \a:LRdir>}#2\HCode{</span>}\par}%
    \def\tocaddchap#1#2#3{\par
       \HCode{<span class="addchapToc" \a:LRdir>}#2\HCode{</span>}\par}%
    \def\tocappendix#1#2#3{\par
-      \HCode{<span class="appendixToc" \a:LRdir>}#1~~#2\HCode{</span>}\par}
+      \HCode{<span class="appendixToc" \a:LRdir>}#1\ \ #2\HCode{</span>}\par}
    \def\tocsection#1#2#3{\par\ \toc:num{section}{#1}{#2}\par}
    \def\toclikesection#1#2#3{\par\ 
       \HCode{<span class="likesectionToc" \a:LRdir>}#2\HCode{</span>}\par}
@@ -1907,13 +1907,13 @@ should be used whe addcontentline instructions are present.
       \ \ \ \ \ \HCode{<span class="likesubparagraphToc" \a:LRdir>}#2\HCode{</span>}\par}
 \def\toc:num#1#2#3{\def\:temp{#1#2}%
    \HCode{<span class="#1Toc" \a:LRdir>}\ifx \:temp\empty 
-   \else \def\:temp{#2}\ifx\:temp\empty\else #2~~\fi\fi #3\HCode{</span>}}
+   \else \def\:temp{#2}\ifx\:temp\empty\else #2\ \ \fi\fi #3\HCode{</span>}}
 >>>
 
 
 \<revtex sections\><<<
 \def\tocpart#1#2#3{\par
-   \HCode{<span class="partToc" \a:LRdir>}\if !#1!\else  #1~~\fi #2\HCode{</span>}\par}%
+   \HCode{<span class="partToc" \a:LRdir>}\if !#1!\else  #1\ \ \fi #2\HCode{</span>}\par}%
 \def\toclikepart#1#2#3{\\HCode{<span class="parlikepartToc" \a:LRdir>}#2\HCode{</span>}\par}%
 \Css{.partToc a, .partToc, .likepartToc a, .likepartToc
         {line-height: 200\%; font-weight:bold; font-size:110\%;}}
@@ -1991,19 +1991,19 @@ should be used whe addcontentline instructions are present.
   {}
   {\HCode{</span><br />}}
 \ConfigureToc{subsection}
-  {\HCode{<span class="subsectionToc" \a:LRdir>}~~\toc:Mark{subsection}}
+  {\HCode{<span class="subsectionToc" \a:LRdir>}\ \ \toc:Mark{subsection}}
   {\End:Mark}
   {}
   {\HCode{</span><br />}}
 \ConfigureToc{subsubsection}
   {\HCode{<span
-       class="subsubsectionToc" \a:LRdir>}~~~~\toc:Mark{subsubsection}}
+       class="subsubsectionToc" \a:LRdir>}\ \ \ \ \toc:Mark{subsubsection}}
   {\End:Mark}
   {}
   {\HCode{</span><br />}}
 \def\toc:Mark#1#2\End:Mark{\if !#2!\else
    \expandafter\ifx \csname #1name\endcsname\relax\else 
-   \csname #1name\endcsname~\fi #2.~~\fi}
+   \csname #1name\endcsname\ \fi #2.\ \ \fi}
 >>>
 
 
@@ -2015,19 +2015,19 @@ should be used whe addcontentline instructions are present.
   {\HCode{</span><br />}}
 \ConfigureToc{chapter}
   {\HCode{<span class="chapterToc" \a:LRdir>}%
-   \ifx \chaptername\:UnDef\else \chaptername~\fi}
-  {.~~}
+   \ifx \chaptername\:UnDef\else \chaptername\ \fi}
+  {.\ \ }
   {}
   {\HCode{</span><br />}}
 \ConfigureToc{likechapter}
   {\HCode{<span class="likechapterToc" \a:LRdir>}}
-  {~~}
+  {\ \ }
   {}
   {\HCode{</span><br />}}
 \ConfigureToc{appendix}
   {\HCode{<span class="appendixToc" \a:LRdir>}%
-   \ifx \appendixname\:UnDef\else \appendixname~\fi}
-  {.~~}
+   \ifx \appendixname\:UnDef\else \appendixname\ \fi}
+  {.\ \ }
   {}
   {\HCode{</span><br />}}
 >>>
@@ -2346,7 +2346,7 @@ should be used whe addcontentline instructions are present.
        |<config bib-p HtmlPar|>%
       }
       {\EndP}
-      {\HCode{<span class="bibsp">}~~~\HCode{</span></span>}}
+      {\HCode{<span class="bibsp">}\ \ \ \HCode{</span></span>}}
 >>>
 
 
@@ -3673,7 +3673,7 @@ class="framed-\ifdim\ruledlinewidth>0em
 \ConfigureToc{part}
   {\toc:br
    \HCode{<span class="partToc" \a:LRdir><span class="toc-mark">}}
-  {\HCode{</span>}~}
+  {\HCode{</span>}\ }
   {}
   {\HCode{</span>}}
 >>>
@@ -3685,7 +3685,7 @@ class="framed-\ifdim\ruledlinewidth>0em
 \ConfigureToc{chapter}
   {\toc:br
    \HCode{<span class="chapterToc" \a:LRdir><span class="toc-mark">}}
-  {\HCode{</span>}~}
+  {\HCode{</span>}\ }
   {}
   {\HCode{</span>}}
 >>>
@@ -3695,7 +3695,7 @@ class="framed-\ifdim\ruledlinewidth>0em
 \ConfigureToc{section}
   {\toc:br
    \HCode{<span class="sectionToc" \a:LRdir><span class="toc-mark">}}
-  {\HCode{</span>}~}
+  {\HCode{</span>}\ }
   {}
   {\HCode{</span>}}
 >>>
@@ -3705,7 +3705,7 @@ class="framed-\ifdim\ruledlinewidth>0em
 \ConfigureToc{subsection}
   {\toc:br
    \HCode{<span class="subsectionToc" \a:LRdir><span class="toc-mark">}}
-  {\HCode{</span>}~}
+  {\HCode{</span>}\ }
   {}
   {\HCode{</span>}}
 >>>
@@ -3715,7 +3715,7 @@ class="framed-\ifdim\ruledlinewidth>0em
 \ConfigureToc{subsubsection}
   {\toc:br
    \HCode{<span class="subsubsectionToc" \a:LRdir><span class="toc-mark">}}
-  {\HCode{</span>}~}
+  {\HCode{</span>}\ }
   {}
   {\HCode{</span>}}
 >>>
@@ -3725,7 +3725,7 @@ class="framed-\ifdim\ruledlinewidth>0em
 \ConfigureToc{subsubsubsection}
   {\toc:br
    \HCode{<span class="subsubsubsectionToc" \a:LRdir><span class="toc-mark">}}
-  {\HCode{</span>}~}
+  {\HCode{</span>}\ }
   {}
   {\HCode{</span>}}
 >>>
@@ -3735,7 +3735,7 @@ class="framed-\ifdim\ruledlinewidth>0em
 \ConfigureToc{subsubsubsubsection}
   {\toc:br
    \HCode{<span class="subsubsubsubsectionToc" \a:LRdir><span class="toc-mark">}}
-  {\HCode{</span>}~}
+  {\HCode{</span>}\ }
   {}
   {\HCode{</span>}}
 >>>
@@ -10343,7 +10343,7 @@ need to change early the catcodes of `\verb'_' and `\verb'^'.
 |<section TITLE+|>
 \Configure{section}{}{}
    {\ifvmode \IgnorePar\fi \EndP\IgnorePar
-    \HCode{<h3 class="sectionHead"\a:LRdir>}\TitleMark~~\HtmlParOff}
+    \HCode{<h3 class="sectionHead"\a:LRdir>}\TitleMark\ \ \HtmlParOff}
    {\HCode{</h3>}\HtmlParOn \IgnoreIndent \ShowPar \par}
 \Configure{likesection}{}{}
    {\ifvmode \IgnorePar\fi
@@ -10360,7 +10360,7 @@ need to change early the catcodes of `\verb'_' and `\verb'^'.
 \ConfigureMark{appendix}{\HCode{<span class="titlemark">}%
    \thechapter\HCode{</span>}}
 \Configure{appendix}{}{}
-   {\IgnorePar\EndP\HCode{<h2 class="appendixHead"\a:LRdir>}\TitleMark{}.~~}
+   {\IgnorePar\EndP\HCode{<h2 class="appendixHead"\a:LRdir>}\TitleMark{}.\ \ }
    {\HCode{</h2>}\IgnoreIndent\par}
 \Configure{appendixTITLE+}{\thechapter\space#1}
 \Configure{likechapter}{}{}
@@ -10375,7 +10375,7 @@ need to change early the catcodes of `\verb'_' and `\verb'^'.
 \<configure html4 scrbook\><<<
 \ConfigureMark{chapter}
    {\if@mainmatter
-       \HCode{<span class="titlemark">}\thechapter\HCode{</span>}~~\fi}
+       \HCode{<span class="titlemark">}\thechapter\HCode{</span>}\ \ \fi}
 \Configure{chapter}{}{}
    {\IgnorePar\EndP\HCode{<h2 class="chapterHead"\a:LRdir>}\TitleMark{}}
    {\HCode{</h2>}\IgnoreIndent\par}
@@ -10385,7 +10385,7 @@ need to change early the catcodes of `\verb'_' and `\verb'^'.
 
 \<configure html4 scrreprt\><<<
 \ConfigureMark{chapter}
-   {\HCode{<span class="titlemark">}\thechapter\HCode{</span>}~~}
+   {\HCode{<span class="titlemark">}\thechapter\HCode{</span>}\ \ }
 \Configure{chapter}{}{}
    {\IgnorePar\EndP\HCode{<h2 class="chapterHead"\a:LRdir>}\TitleMark{}}
    {\HCode{</h2>}\IgnoreIndent\par}
@@ -16063,6 +16063,11 @@ Blue  = 1-minimum(1,Yellow *(1-Black)+Black)
    {\add:color{background-color}{\current@color}{\HRow-\HCol}}
 \def\add:color#1#2#3{%
   \Configure{SetHColor}{\Css{ \#TBL-\TableNo-#3{ #1:\HColor }}}{#2}}
+
+% redefine default table configuration and put the color rule
+\def\a:HBorder{<tr class="hline" style="border-top:1px solid \#\hline:color">}
+% don't display <hr> elements in colored \hline
+\Css{tr.hline td hr{display:none}}
 >>>
 
 [\HPage{test file}