texlive[62897] Master/texmf-dist: tex4ht updates, texhr r1096-1106

commits+karl at tug.org commits+karl at tug.org
Mon Apr 4 16:45:45 CEST 2022


Revision: 62897
          http://tug.org/svn/texlive?view=revision&revision=62897
Author:   karl
Date:     2022-04-04 16:45:45 +0200 (Mon, 04 Apr 2022)
Log Message:
-----------
tex4ht updates, texhr r1096-1106

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1096

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/minted.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
    trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/tex/generic/tex4ht/subfiles.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,10 +1,60 @@
-2021-03-21  Michal Hoftich  <michal.h21 at gmail.com>
+2022-04-04  Michal Hoftich  <michal.h21 at gmail.com>
 
+	* tex4ht-4ht.tex (minted.4ht): fixed spurious whitespace produced by
+	\mintinline.
+	* tex4ht-html4.tex (html4.4ht): disable ht-fonts for inline Minted.
+
+2022-03-31  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-html4.tex (html4.4ht): support frames and background colors
+	in custom Listings environments.
+	https://tex.stackexchange.com/a/639135/2891
+
+2022-03-30  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-sty.tex (tex4ht.sty): don't redefine \IfFileExists. It can
+	break packages that don't expect extra tokens at it's end.
+	https://tex.stackexchange.com/a/638965/2891
+
+2022-03-29  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (subfiles.4ht): fixed support for multiple included
+	files in the Subfiles package.
+	https://tex.stackexchange.com/a/353117/2891
+
+	* tex4ht-html4.tex (html4.4ht): handle \# character in \title.
+	https://tex.stackexchange.com/a/638821/2891
+
+2022-03-28  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-ooffice.tex (ooffice.4ht): don't use bold font for \textsf
+	command.
+
+2022-03-25  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (biblatex.4ht): fixed issues with backref page
+	numbers.
+	https://github.com/michal-h21/make4ht/issues/58
+
+2022-03-24  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): use \detokenize to
+	prevent math environments from expansion.
+	https://puszcza.gnu.org.ua/bugs/?557
+	* tex4ht-4ht.tex (listings.4ht): ignore spurious spaces at beginning
+	of listings.
+	* tex4ht-html4.tex (html4.4ht): removed extra <br> tags, fixed
+	issues with extra newlines.
+	* tex4ht-4ht.tex (biblatex.4ht): removed spurious whitespace after
+	backrefences.
+
+2022-03-21  Michal Hoftich  <michal.h21 at gmail.com>
+
 	* tex4ht-4ht.tex (arydshln.4ht): added basic support for the
 	Arydshln package.
 	https://tex.stackexchange.com/a/637897/2891
 
-2021-03-20  Michal Hoftich  <michal.h21 at gmail.com>
+2022-03-20  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-4ht.tex (graphics.4ht): don't execute graphics rules when
 	user selected other driver than dvips.
@@ -13,13 +63,13 @@
 
 	* update-htfonts: add installed files, not dev.
 
-2021-03-20  Michal Hoftich  <michal.h21 at gmail.com>
+2022-03-20  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): added support for background and
 	border colors in Listings.
 	https://tex.stackexchange.com/a/637789/2891
 
-2021-03-17  Michal Hoftich  <michal.h21 at gmail.com>
+2022-03-17  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-fonts-opensans.tex: added support for OpenSans fonts.
 	https://tex.stackexchange.com/q/637314/2891

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1095 2022-03-21 13:29:42Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1103 2022-03-29 15:46:43Z michal_h21 $
 % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
 % Read by tex4ht-cond4ht.
 %
@@ -369,5 +369,6 @@
 \AddFile{9}{menukeys}
 \AddFile{9}{animate}
 \AddFile{9}{sectionbreak}
+\AddFile{9}{subfiles}
 \AddFile{9}{fontawesome5}
 % \AddFile{9}{mktex4ht}

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1095 2022-03-21 13:29:42Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1106 2022-04-04 10:06:26Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2022 TeX Users Group    
@@ -2795,7 +2795,8 @@
     % insert link to the page
     \html:addr\Link-{}{|<haddr prefix|>\last:haddr}\EndLink%
     % save link to the .xref file
-    \Tag{)Q##1\thepage}{|<haddr prefix|>\last:haddr}%
+    % we need to use \protected at write to get correct page numbers in backrefs
+    \protected at write\:refout{}{\string\:CrossWord{)Q##1\thepage}{|<haddr prefix|>\last:haddr}{\folio}}
     % we need to save the link destination in .xref file
     % too, otherwise \Link command would issue warning
     \Tag{)Q|<haddr prefix|>\last:haddr}{\FileNumber}%
@@ -2823,18 +2824,18 @@
   % back to the citations on the given pages
   \let\orig:hyperlink\hyperlink%
   \let\hyperlink\bbx:hyperlink%
-  \ifnumless{\abx at pagerefstyle}{0}
+  \ifnumless{\abx at pagerefstyle}{0}%
     {\usebibmacro{list:plain}%
-     \ifhyperref
-       {\hyperlink{page.#1}{#1}}
-       {#1}}
-    {\ifnumequal{\value{listcount}}{1}
-       {\usebibmacro{pageref:init}}
+     \ifhyperref%
+       {\hyperlink{page.#1}{#1}}%
+       {#1}}%
+    {\ifnumequal{\value{listcount}}{1}%
+       {\usebibmacro{pageref:init}}%
        {}%
      \usebibmacro{pageref:comp}{#1}%
-     \ifnumequal{\value{listcount}}{\value{liststop}}
-       {\usebibmacro{pageref:dump}}
-       {}}
+     \ifnumequal{\value{listcount}}{\value{liststop}}%
+       {\usebibmacro{pageref:dump}}%
+       {}}%
   \let\hyperlink\orig:hyperlink%
 }
 
@@ -4745,6 +4746,43 @@
 \Hinput{sectionbreak}
 >>> \AddFile{9}{sectionbreak}
 
+
+\<subfiles.4ht\><<< 
+% subfiles.4ht (|version), generated from |jobname.tex 
+% Copyright 2022 TeX Users Group 
+|<TeX4ht license text|> 
+|<subfiles enddocument|>
+\Hinput{subfiles}
+\endinput
+>>> \AddFile{9}{subfiles}
+
+We use the original version of \Verb|\subfiles at renewEndDocument|, the only 
+change is that we added the \Verb|\choose:begin| redefinition. It is necessary
+to prevent processing of the document after \Verb|\end{document}| in the 
+included subfile.
+
+\<subfiles enddocument\><<<
+\def\:tempa#1{%
+  \ifcsname subfiles at end\endcsname
+  \else
+    \subfiles at saveEndTo\subfiles at end
+  \fi
+  \let\choose:begin\@secondoftwo
+  \expandafter\def\csname end \endcsname##1{%
+    \romannumeral
+    \subfiles at StrIfEqTF{##1}{document}{%
+      \z@
+      \subfiles at restoreEndFrom\subfiles at end
+      #1%
+    }{%
+      \expandafter\expandafter\expandafter\z@\subfiles at end{##1}%
+    }%
+  }%
+}
+
+\HLet\subfiles at renewEndDocument\:tempa
+>>>
+
 \Section{url.sty}
 %%%%%%%%%%%%%%%%%%
 
@@ -24776,22 +24814,44 @@
 
 \<minted.4ht\><<<
 % minted.4ht (|version), generated from |jobname.tex
-% Copyright 2020-2021 TeX Users Group
+% Copyright 2022 TeX Users Group
 |<TeX4ht license text|>
+
+|<minted inline fixes|>
+|<minted background color|>
+|<minted background color|>
+|<minted input fixes|>
+
+\Hinput{minted}
+\endinput
+>>> \AddFile{9}{minted}
+
+Support for inline Minted listings. We need to take care of
+newline and space characters, as they produce unwanted white space
+in the generated HTML.
+
+\<minted inline fixes\><<<
 \NewConfigure{InlineCode}{2}
+% this is a hack to hide a newline that is produced, and which causes spurious space in the output
+\NewConfigure{MintedHideNewline}{2} 
+\Configure{MintedHideNewline}{\HCode{<!--}}{\HCode{-->}}
 
 \def\:tempa#1{%
   \endgroup%
   \begingroup%
-  \Configure{BVerbatimInput}{\HCode{}}{}{}{}{}\a:InlineCode% The \HCode is necessary for correct paragraph handling
+  \Configure{BVerbatimInput}{\HCode{}\ht:special{t4ht@(}}% \HCode is necessary for correct paragraph handlingling
+  {\a:MintedHideNewline}{\ht:special{t4ht@)}}{}{}% also hide newline and spurious spaces
+  \a:InlineCode%
   \begingroup%
-  \o:minted at inline@iii:{#1}%
+  \o:minted at inline@iii:{#1}\b:MintedHideNewline%
   \b:InlineCode%
   \endgroup%
 }
 
 \HLet\minted at inline@iii\:tempa
+>>>
 
+\<minted background color\><<<
 % support for background color in Minted listings
 \NewConfigure{MintedColorbg}{2}
 \renewenvironment{minted at colorbg}[1]{%
@@ -24801,14 +24861,8 @@
   \a:MintedColorbg%
   }
   {\b:MintedColorbg\medskip\noindent}
+>>>
 
-|<minted input fixes|>
-
-\Hinput{minted}
-\endinput
->>> \AddFile{9}{minted}
-
-
 Minted sometimes produces unexpected results. For example, << characters 
 get translated to guilelemets. To prevent that, we define new configuration,
 mintedfixes, where we can redefine macrod used by Minted to produce correct
@@ -30938,19 +30992,21 @@
    \lst at newlinetrue
 }%
 \HLet\lst at NewLine\:tempa
-\def\lst at InputListing#1{% 
-    \begingroup 
-      \lsthk at PreSet \gdef\lst at intname{#1}% 
+\def\:tempa#1{
+    \begingroup%
+      \lsthk at PreSet\gdef\lst at intname{#1}% 
       \expandafter\lstset\expandafter{\lst at set}% 
-      \lsthk at DisplayStyle 
-      \catcode\active=\active 
-      \a:lstinputlisting \lst at Init\relax \let\lst at gobble\z@ 
-      \lst at SkipToFirst 
+      \lsthk at DisplayStyle%
+      \catcode\active=\active%
+      \a:lstinputlisting\special{t4ht@[}\lst at Init\relax \let\lst at gobble\z@%
+      \lst at SkipToFirst%
       \lst at ifprint \def\lst at next{\input{#1}}% 
-             \else \let\lst at next\@empty \fi 
-      \lst at next \lst at DeInit 
-      \b:lstinputlisting
+             \else \let\lst at next\@empty \fi%
+      \special{t4ht@]}\lst at next \lst at DeInit%
+      \b:lstinputlisting%
     \endgroup} 
+
+\HLet\lst at InputListing\:tempa 
 \NewConfigure{lstinputlisting}{2}
 >>>
 

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1093 2022-03-20 16:15:35Z karl $
+% $Id: tex4ht-html4.tex 1106 2022-04-04 10:06:26Z michal_h21 $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -6328,6 +6328,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 >>>
 
@@ -6352,6 +6354,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\shorttitle}}
 >>>
 
@@ -6378,6 +6382,8 @@
 \let \bf=\empty
 \let \centering=\empty
 \def \ignorespaces##1\vskip##2//{##1}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title//}%
 }%
 >>>
@@ -6391,6 +6397,8 @@
 \def\mbox{\hbox}%
 \let\\\space \def\TeX{TeX}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}%
 >>>
 
@@ -12566,6 +12574,7 @@
 \<env for titles\><<<
 \let\"=\:same \let\~=\:same \let\^=\:same
 \let\v=\:same \let\'=\:same \let\r=\:same
+\let\#=\:same 
 \PictureOff
 >>>
 
@@ -15197,7 +15206,8 @@
 
 Configuration for the inline code
 \<configure html4 minted\><<<
-\Configure{InlineCode}{\HCode{<code>}}{\HCode{</code>}}
+\Configure{InlineCode}{\HCode{<code class="minted-inline">}\NoFonts}{\EndNoFonts\HCode{</code>}}
+\Css{code.minted-inline{font-family:monospace,monospace;}}
 >>>
 
 Configuration for listings with colored backgrounds
@@ -15236,21 +15246,29 @@
    fixed size fonts (see listings.dtx)}
 >>>
 
+This configuration is used mainly when user defines new environment using \verb|lstnewenvironment|.
+
 \<configure html4 listings\><<<
+\HAssign\listingN=0
 \HAssign\listings:Depth = 0
 \Configure{listings}
-   {\ifvmode \IgnorePar\fi \EndP
+   {\ifvmode \IgnorePar\fi \EndP%
     {\everypar{}\leavevmode}\HCode{<!--l. \the\inputlineno-->}%
-     \ifnum \listings:Depth=0 \HCode{<pre class="listings">}\else
-                              \HCode{<span class="listings-nested">}\fi
-     \gHAdvance\listings:Depth by 1
+     \ifnum \listings:Depth=0 \HCode{<pre class="listings" id="listing-\listingN">}\else%
+                              \HCode{<span class="listings-nested" id="listing-\listingN">}\fi%
+     \gHAdvance\listings:Depth by 1%
+     \gdef\start:LstLn{}%
    }
    {\gHAdvance\listings:Depth by -1
     \ifnum \listings:Depth=0 \HCode{</pre>}\else
                              \HCode{</span>}\fi
    }
-   {|<nbsp|>\HCode{<br /><span class="label">}}
+   {\start:LstLn\HCode{<span class="label">}%
+   \gdef\start:LstLn{\HCode{\Hnewline}}}%
    {\HCode{</span>}}%
+\Css{pre.listings{font-family: monospace,monospace; white-space: pre-wrap; 
+                    margin-top:0.5em; margin-bottom:0.5em;
+                   }}
 >>>
 
 \<configure html4 listings\><<<
@@ -15280,14 +15298,12 @@
 
 
 \<configure html4 listings\><<<
-\HAssign\listingN=0
 \ConfigureEnv{lstlisting}
    {\ifvmode \IgnorePar\fi \EndP  
-    \gHAdvance\listingN by 1
     \HCode{<!--l. \the\inputlineno-->}%
     \gdef\start:LstLn{%
        \HCode{<pre class="lstlisting" id="listing-\listingN">}%
-       \gdef\start:LstLn{|<nbsp|>\HCode{<br />\Hnewline}}}
+       \gdef\start:LstLn{\HCode{\Hnewline}}}
     \bgroup%
     % we put the closing </div> here in order to support floating listings
     % https://tex.stackexchange.com/a/615703/2891
@@ -15301,7 +15317,7 @@
    {\egroup\par}
    {} {}
 \Css{.lstlisting .label{margin-right:0.5em; }}
-\Css{pre.lstlisting{font-family: monospace,monospace; white-space: nowrap; 
+\Css{pre.lstlisting{font-family: monospace,monospace; white-space: pre-wrap; 
                     margin-top:0.5em; margin-bottom:0.5em;
                    }}
 >>>
@@ -15310,14 +15326,12 @@
 \Configure{lstinputlisting}  
    {\ifvmode \IgnorePar\fi \EndP  
     \HCode{<!--l. \the\inputlineno-->}%  
-    \gHAdvance\listingN by 1%
-    \HCode{<pre class="lstinputlisting" id="listing-\listingN">}%  
+    \gdef\start:LstLn{\HCode{<pre class="lstinputlisting" id="listing-\listingN">}\gdef\start:LstLn{\HCode{\Hnewline}}}% ignore first newline, to prevent spurious line
     \bgroup\ttfamily%\special{t4ht@(}%  
        \Configure{listings}%
          {{\everypar{}\leavevmode}}%  
          {{\everypar{}\leavevmode}}%  
-         {|<nbsp|>%
-             \HCode{<br />\Hnewline<span class="label">}}%  
+         {\start:LstLn\HCode{<span class="label">}}%  
          {\HCode{</span>}}%  
    }  
    {%\special{t4ht@)}
@@ -15325,7 +15339,7 @@
     \ifvmode \IgnorePar\fi \EndP  \HCode{</pre>}\par}% 
 \Css{pre.lstinputlisting{
    font-family: monospace,monospace;
-   white-space: nowrap;
+   white-space: pre-wrap; 
 }}
 \Css{.lstinputlisting .label{margin-right:0.5em;}}
 >>>
@@ -15362,7 +15376,8 @@
 
 \<configure html4 listings\><<<
 \lst at AddToHook{Init}{%
-\bgroup%
+  \gHAdvance\listingN by 1% increase the ID before we save colors. 
+  \bgroup%
   % handle backround color and border in listings
   \ifx\lst at fillcolor\@empty\else%
     \lst at fillcolor%

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathjax.tex	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathjax.tex 1023 2021-12-02 09:42:42Z michal_h21 $
+% $Id: tex4ht-mathjax.tex 1098 2022-03-24 22:18:43Z michal_h21 $
 % compile: latex tex4ht-mathjax
 %
 % Copyright 2018-2021 TeX Users Group
@@ -104,7 +104,7 @@
 \newcommand\VerbMath[1]{%
   \cs_if_exist:cTF{#1}{
     \RenewDocumentEnvironment{#1}{+!b}{%
-      \NoFonts\expandafter\VerbMathToks\expandafter{##1}{#1}\EndNoFonts%
+      \NoFonts\expandafter\VerbMathToks\expandafter{\detokenize{##1}}{#1}\EndNoFonts%
     }{}
   }{}%
 }

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-ooffice.tex	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1074 2022-02-06 19:43:26Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1101 2022-03-28 11:52:50Z michal_h21 $
 % compile 3 times: latex tex4ht-ooffice
 %      htlatex tex4ht-ooffice "xhtml,4,sections+"
 %
@@ -7409,7 +7409,7 @@
 \<oo textsf style\><<<
 <style:style style:name="textsf" style:family="text">\Hnewline
    <style:text-properties fo:font-style="normal" 
-                     fo:font-weight="bold"
+                     fo:font-weight="normal"
                      style:font-family-generic="swiss" 
                      style:font-pitch="variable" />\Hnewline
 </style:style>\Hnewline

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-sty.tex 981 2021-09-14 20:14:03Z michal_h21 $
+% $Id: tex4ht-sty.tex 1104 2022-03-30 12:06:52Z michal_h21 $
 % tex tex4ht-sty   or   ht tex tex4ht-sty
 %
 % Copyright 2009-2020 TeX Users Group
@@ -9082,18 +9082,25 @@
 \<defs for early latex subs/sups\><<<
 \append:def\:RestoreCatcodes{\early:sub\early:sup}
 \let\:IfFileExists\IfFileExists
-\long\def\IfFileExists#1#2#3{%
-   \csname recall:sub\endcsname   
-   \csname recall:sup\endcsname
-   \expandafter\let\csname #1:sub\endcsname=\early:sub
-   \expandafter\let\csname #1:sup\endcsname=\early:sup
-   \let\early:sub=\relax     \let\recall:sub\relax   
-   \let\early:sup=\relax     \let\recall:sup\relax
-   \:IfFileExists{#1}{#2}{#3}%
-   \expandafter\let\expandafter\early:sub\csname #1:sub\endcsname
-   \expandafter\let\expandafter\early:sup\csname #1:sup\endcsname
-   \early:sub \early:sup
-}
+
+% I am not sure why we used this declaration. It is from the original 
+% TeX4ht sources, so it probably had some reason. The problem is that it 
+% inserts extra tokens after \:IfFileExists, and if some package uses
+% something like \IfFileExists{foo.sty}{\@firstoftwo}{\@secondoftwo}{aa}{bb}, 
+% then it fails. I've found this issue with the Standalone class.
+% See https://tex.stackexchange.com/a/638965/2891 for example where it fails.
+% \long\def\IfFileExists#1#2#3{%
+%    \csname recall:sub\endcsname   
+%    \csname recall:sup\endcsname
+%    \expandafter\let\csname #1:sub\endcsname=\early:sub
+%    \expandafter\let\csname #1:sup\endcsname=\early:sup
+%    \let\early:sub=\relax     \let\recall:sub\relax   
+%    \let\early:sup=\relax     \let\recall:sup\relax
+%    \:IfFileExists{#1}{#2}{#3}%
+%    \expandafter\let\expandafter\early:sub\csname #1:sub\endcsname
+%    \expandafter\let\expandafter\early:sup\csname #1:sup\endcsname
+%    \early:sub \early:sup
+% }
 \ifx \o:document\:UnDef
    \pend:def\Preamble{%
      \csname recall:sub\endcsname   

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/biblatex.4ht	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% biblatex.4ht (2022-03-14-14:03), generated from tex4ht-4ht.tex
+% biblatex.4ht (2022-04-04-07:06), generated from tex4ht-4ht.tex
 % Copyright 2007-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-03-14-14:03}
+\immediate\write-1{version 2022-04-04-07:06}
 
    \def\make:blx:ver#1.#2#3\relax{%
    %\ifdim#1pt< 3pt \xdef\blx:ver:no{2}\else\xdef\blx:ver:no{3}\fi%
@@ -597,7 +597,8 @@
     % insert link to the page
     \html:addr\Link-{}{x\last:haddr}\EndLink%
     % save link to the .xref file
-    \Tag{)Q##1\thepage}{x\last:haddr}%
+    % we need to use \protected at write to get correct page numbers in backrefs
+    \protected at write\:refout{}{\string\:CrossWord{)Q##1\thepage}{x\last:haddr}{\folio}}
     % we need to save the link destination in .xref file
     % too, otherwise \Link command would issue warning
     \Tag{)Qx\last:haddr}{\FileNumber}%
@@ -625,18 +626,18 @@
   % back to the citations on the given pages
   \let\orig:hyperlink\hyperlink%
   \let\hyperlink\bbx:hyperlink%
-  \ifnumless{\abx at pagerefstyle}{0}
+  \ifnumless{\abx at pagerefstyle}{0}%
     {\usebibmacro{list:plain}%
-     \ifhyperref
-       {\hyperlink{page.#1}{#1}}
-       {#1}}
-    {\ifnumequal{\value{listcount}}{1}
-       {\usebibmacro{pageref:init}}
+     \ifhyperref%
+       {\hyperlink{page.#1}{#1}}%
+       {#1}}%
+    {\ifnumequal{\value{listcount}}{1}%
+       {\usebibmacro{pageref:init}}%
        {}%
      \usebibmacro{pageref:comp}{#1}%
-     \ifnumequal{\value{listcount}}{\value{liststop}}
-       {\usebibmacro{pageref:dump}}
-       {}}
+     \ifnumequal{\value{listcount}}{\value{liststop}}%
+       {\usebibmacro{pageref:dump}}%
+       {}}%
   \let\hyperlink\orig:hyperlink%
 }
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% html4.4ht (2022-03-20-09:15), generated from tex4ht-html4.tex
+% html4.4ht (2022-04-04-07:07), 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-03-20-09:15}
+\immediate\write-1{version 2022-04-04-07:07}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -2325,6 +2325,7 @@
 \let\^^_\v
 \Configure{@TITLE}{\let\"=\:same \let\~=\:same \let\^=\:same
 \let\v=\:same \let\'=\:same \let\r=\:same
+\let\#=\:same
 \PictureOff
 }
 
@@ -5868,6 +5869,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div class="maketitle">}}
@@ -8559,6 +8562,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div class="maketitle">}}
@@ -11181,6 +11186,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div class="maketitle">}}
@@ -11333,7 +11340,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{graphics}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -11523,7 +11529,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{graphicx}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -11639,6 +11644,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\shorttitle}}
 %
     \HCode{<div  class="maketitle">}%
@@ -14131,6 +14138,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsbook}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14217,6 +14225,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\shorttitle}}
 %
     \HCode{<div  class="maketitle">}%
@@ -16757,7 +16767,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsproc}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16844,6 +16853,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\shorttitle}}
 %
     \HCode{<div  class="maketitle">}%
@@ -19358,7 +19369,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsmath}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19375,6 +19385,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amstex1}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19395,6 +19406,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsppt}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19517,6 +19529,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{babel}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19824,6 +19837,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{plain}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20256,7 +20270,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{biblatex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20428,6 +20441,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{glossary}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20441,7 +20455,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{letter}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20557,7 +20570,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{seslideb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -23341,6 +23353,8 @@
 \let \bf=\empty
 \let \centering=\empty
 \def \ignorespaces##1\vskip##2//{##1}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title//}%
 }%
 %
@@ -25828,6 +25842,8 @@
 \let \bf=\empty
 \let \centering=\empty
 \def \ignorespaces##1\vskip##2//{##1}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title//}%
 }%
 %
@@ -28315,6 +28331,8 @@
 \let \bf=\empty
 \let \centering=\empty
 \def \ignorespaces##1\vskip##2//{##1}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title//}%
 }%
 %
@@ -28548,6 +28566,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{csquotes}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28562,6 +28581,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{CJK}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28595,7 +28615,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{german}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28658,6 +28677,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{fancyvrb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28695,7 +28715,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{epsf}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28720,6 +28739,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amscd}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28855,7 +28875,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{xcolor}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28878,6 +28897,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{colortbl}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28916,7 +28936,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{minitoc}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -28981,7 +29000,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{index}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29010,6 +29028,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{multind}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29041,7 +29060,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{fancybox}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29127,6 +29145,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{adjustbox}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29148,7 +29167,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{awesomebox}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29323,6 +29341,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{eplain}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29415,6 +29434,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{context}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -29980,7 +30000,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{tabulary}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30050,7 +30069,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ntheorem}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30193,6 +30211,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{t2benc}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30241,6 +30260,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{verse}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30294,8 +30314,6 @@
 
 
 
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{arabicore}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30402,6 +30420,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{abidir}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30428,7 +30447,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{koi8-r}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30439,6 +30457,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{frenchb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30508,6 +30527,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div class="slide cover"><div class="maketitle">}}
@@ -30628,7 +30649,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{mex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30800,6 +30820,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{wrapfig}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30864,7 +30885,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{subscript}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30898,6 +30918,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{subcaption}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30920,7 +30941,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{emulateapj}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -30981,6 +31001,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{picins}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31090,6 +31111,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ot4enc}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31357,6 +31379,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pd1enc}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31616,7 +31639,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{revtex4}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -31661,6 +31683,8 @@
 \let \bf=\empty
 \let \centering=\empty
 \def \ignorespaces##1\vskip##2//{##1}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title//}%
 }%
 %
@@ -32111,7 +32135,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{texinfo}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -32302,6 +32325,8 @@
 \def\mbox{\hbox}%
 \let\\\space \def\TeX{TeX}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}%
 %
     \HCode{<div class="maketitle">}}
@@ -33073,6 +33098,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scrreprt}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -33086,6 +33112,8 @@
 \def\mbox{\hbox}%
 \let\\\space \def\TeX{TeX}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}%
 %%
     \HCode{<div  class="maketitle">}}
@@ -33854,7 +33882,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{elsart}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -33916,6 +33943,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div class="maketitle">}\bgroup
@@ -34337,6 +34366,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{g-brief}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34529,7 +34559,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ltxguide}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34561,6 +34590,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div  class="maketitle">}}
@@ -34594,6 +34625,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{lncse}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34608,6 +34640,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div class="maketitle">}}
@@ -34669,7 +34703,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{bibtopic}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34684,7 +34717,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{harvard}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34719,6 +34751,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scrjura}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34741,7 +34774,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{cp1256}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34752,6 +34784,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{8859-6}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34762,7 +34795,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{germanb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34775,7 +34807,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ngermanb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -34817,7 +34848,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{minted}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \Configure{InlineCode}{\HCode{<code>}}{\HCode{</code>}}
+    \Configure{InlineCode}{\HCode{<code class="minted-inline">}\NoFonts}{\EndNoFonts\HCode{</code>}}
+\Css{code.minted-inline{font-family:monospace,monospace;}}
 \Configure{MintedColorbg}
    {\ifvmode\IgnorePar\fi\EndP\HCode{<div class="minted-color-box" style="background-color:\#\minted:bgcolor">}}
    {\ifvmode\IgnorePar\fi\EndP\HCode{</div>}}
@@ -34851,6 +34883,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 }%
     \HCode{<div class="maketitle">}}
@@ -35378,6 +35412,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{slides}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35457,6 +35492,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \vtop\bgroup \IgnorePar \EndP \HCode{<div  class="maketitle">}}
@@ -35477,7 +35514,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{foils}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35515,6 +35551,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \HCode{<div class="maketitle">}%
@@ -35582,6 +35620,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{xy}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35598,7 +35637,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pictex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35654,6 +35692,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pst-all}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35668,7 +35707,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{endfloat}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35679,6 +35717,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{mfpic}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35695,7 +35734,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pb-diagram}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35727,6 +35765,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{overpic}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35740,6 +35779,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{dratex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35750,7 +35790,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{europecv}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35936,6 +35975,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{vowel}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -35949,7 +35989,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{enumitem}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36003,6 +36042,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{enumerate}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36030,7 +36070,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{linguex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36090,6 +36129,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{covington}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36152,7 +36192,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{diagram}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36355,6 +36394,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{eurosym}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36367,7 +36407,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{SIunits}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36453,6 +36492,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{appendix}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36463,7 +36503,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{res}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36585,6 +36624,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{algorithmicx}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36627,7 +36667,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{algorithm}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36700,6 +36739,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{gloss}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36783,6 +36823,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{longdiv}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -36967,6 +37008,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \Configure{HtmlPar}
@@ -37016,6 +37059,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 %
     \Configure{HtmlPar}
@@ -37068,6 +37113,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{rotating}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37080,7 +37126,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{boxedminipage}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37141,6 +37186,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{paralist}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37305,7 +37351,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pifont}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37354,31 +37399,33 @@
 \Css{code.lstinline{font-family:monospace,monospace;}}
 \Log:Note{to ensure proper alignments use
    fixed size fonts (see listings.dtx)}
+\HAssign\listingN=0
 \HAssign\listings:Depth = 0
 \Configure{listings}
-   {\ifvmode \IgnorePar\fi \EndP
+   {\ifvmode \IgnorePar\fi \EndP%
     {\everypar{}\leavevmode}\HCode{<!--l. \the\inputlineno-->}%
-     \ifnum \listings:Depth=0 \HCode{<pre class="listings">}\else
-                              \HCode{<span class="listings-nested">}\fi
-     \gHAdvance\listings:Depth by 1
+     \ifnum \listings:Depth=0 \HCode{<pre class="listings" id="listing-\listingN">}\else%
+                              \HCode{<span class="listings-nested" id="listing-\listingN">}\fi%
+     \gHAdvance\listings:Depth by 1%
+     \gdef\start:LstLn{}%
    }
    {\gHAdvance\listings:Depth by -1
     \ifnum \listings:Depth=0 \HCode{</pre>}\else
                              \HCode{</span>}\fi
    }
-   {\:nbsp%
-\HCode{<br /><span class="label">}}
+   {\start:LstLn\HCode{<span class="label">}%
+   \gdef\start:LstLn{\HCode{\Hnewline}}}%
    {\HCode{</span>}}%
+\Css{pre.listings{font-family: monospace,monospace; white-space: pre-wrap;
+                    margin-top:0.5em; margin-bottom:0.5em;
+                   }}
 \Configure{listings-init}{\ttfamily\special{t4ht@(}}{\special{t4ht@)}}
-\HAssign\listingN=0
 \ConfigureEnv{lstlisting}
    {\ifvmode \IgnorePar\fi \EndP
-    \gHAdvance\listingN by 1
     \HCode{<!--l. \the\inputlineno-->}%
     \gdef\start:LstLn{%
        \HCode{<pre class="lstlisting" id="listing-\listingN">}%
-       \gdef\start:LstLn{\:nbsp%
-\HCode{<br />\Hnewline}}}
+       \gdef\start:LstLn{\HCode{\Hnewline}}}
     \bgroup%
     % we put the closing </div> here in order to support floating listings
     % https://tex.stackexchange.com/a/615703/2891
@@ -37392,21 +37439,18 @@
    {\egroup\par}
    {} {}
 \Css{.lstlisting .label{margin-right:0.5em; }}
-\Css{pre.lstlisting{font-family: monospace,monospace; white-space: nowrap;
+\Css{pre.lstlisting{font-family: monospace,monospace; white-space: pre-wrap;
                     margin-top:0.5em; margin-bottom:0.5em;
                    }}
 \Configure{lstinputlisting}
    {\ifvmode \IgnorePar\fi \EndP
     \HCode{<!--l. \the\inputlineno-->}%
-    \gHAdvance\listingN by 1%
-    \HCode{<pre class="lstinputlisting" id="listing-\listingN">}%
+    \gdef\start:LstLn{\HCode{<pre class="lstinputlisting" id="listing-\listingN">}\gdef\start:LstLn{\HCode{\Hnewline}}}% ignore first newline, to prevent spurious line
     \bgroup\ttfamily%\special{t4ht@(}%
        \Configure{listings}%
          {{\everypar{}\leavevmode}}%
          {{\everypar{}\leavevmode}}%
-         {\:nbsp%
-%
-             \HCode{<br />\Hnewline<span class="label">}}%
+         {\start:LstLn\HCode{<span class="label">}}%
          {\HCode{</span>}}%
    }
    {%\special{t4ht@)}
@@ -37414,7 +37458,7 @@
     \ifvmode \IgnorePar\fi \EndP  \HCode{</pre>}\par}%
 \Css{pre.lstinputlisting{
    font-family: monospace,monospace;
-   white-space: nowrap;
+   white-space: pre-wrap;
 }}
 \Css{.lstinputlisting .label{margin-right:0.5em;}}
 \lst at AddToHook{PostOutput}{\HCode{</span>}}%
@@ -37425,7 +37469,8 @@
   \expandafter\convertcolorspec\html at color{HTML}\html at color%
   \HCode{<span style="color:\#\html at color">}}% init
 \lst at AddToHook{Init}{%
-\bgroup%
+  \gHAdvance\listingN by 1% increase the ID before we save colors.
+  \bgroup%
   % handle backround color and border in listings
   \ifx\lst at fillcolor\@empty\else%
     \lst at fillcolor%
@@ -37461,6 +37506,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{alphanum}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37521,7 +37567,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{lineno}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37602,6 +37647,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{acm-proc-article-sp}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37642,6 +37688,8 @@
 \def\mbox{\hbox}%
 \def\gobble:font##1##2{##2}\:TITLE: \no:fonts
 \def\footnotemark[##1]{}%
+\def\:hashintitle{\protect\symbol{35}}
+\let\#\:hashintitle
 \Tag{TITLE+}{\@title}}
 }
   {}
@@ -37919,7 +37967,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{endnotes}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37934,6 +37981,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{web}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -37960,7 +38008,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{exerquiz}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38071,6 +38118,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{multicol}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38103,7 +38151,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ProTex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38146,7 +38193,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{th4}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38397,6 +38443,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{mdwlist}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38458,7 +38505,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{sverb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38548,6 +38594,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{manmac}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38661,6 +38708,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{cp862}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38671,7 +38719,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{cp1250}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38702,6 +38749,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{cp437de}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38712,7 +38760,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{cp865}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38747,6 +38794,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{polski}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38759,7 +38807,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{portuges}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -38993,6 +39040,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scottish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39005,7 +39053,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{slovak}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39450,6 +39497,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{swedish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39462,7 +39510,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{turkish}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39499,6 +39546,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{welsh}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39511,7 +39559,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{hebrew}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39548,6 +39595,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{croatian}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39748,7 +39796,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{czech}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39785,6 +39832,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{english}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39797,7 +39845,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{esperant}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39834,6 +39881,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{francais}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39846,7 +39894,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{galician}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -39993,6 +40040,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{exam}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40085,7 +40133,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{polyglossia}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40097,6 +40144,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{fontspec}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40116,7 +40164,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{framed}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40157,6 +40204,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{tcolorbox}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40185,7 +40233,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{parallel}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40218,6 +40265,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{texmate}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40231,7 +40279,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{animate}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -40267,5 +40314,6 @@
 
 
 
+
 \endinput
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/listings.4ht	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% listings.4ht (2022-02-16-13:57), generated from tex4ht-4ht.tex
+% listings.4ht (2022-04-04-07:06), generated from tex4ht-4ht.tex
 % Copyright 2001-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-02-16-13:57}
+\immediate\write-1{version 2022-04-04-07:06}
 
 \@ifpackageloaded{xcolor}{}{%
 \RequirePackage{xcolor}
@@ -68,19 +68,21 @@
    \lst at newlinetrue
 }%
 \HLet\lst at NewLine\:tempa
-\def\lst at InputListing#1{%
-    \begingroup
-      \lsthk at PreSet \gdef\lst at intname{#1}%
+\def\:tempa#1{
+    \begingroup%
+      \lsthk at PreSet\gdef\lst at intname{#1}%
       \expandafter\lstset\expandafter{\lst at set}%
-      \lsthk at DisplayStyle
-      \catcode\active=\active
-      \a:lstinputlisting \lst at Init\relax \let\lst at gobble\z@
-      \lst at SkipToFirst
+      \lsthk at DisplayStyle%
+      \catcode\active=\active%
+      \a:lstinputlisting\special{t4ht@[}\lst at Init\relax \let\lst at gobble\z@%
+      \lst at SkipToFirst%
       \lst at ifprint \def\lst at next{\input{#1}}%
-             \else \let\lst at next\@empty \fi
-      \lst at next \lst at DeInit
-      \b:lstinputlisting
+             \else \let\lst at next\@empty \fi%
+      \special{t4ht@]}\lst at next \lst at DeInit%
+      \b:lstinputlisting%
     \endgroup}
+
+\HLet\lst at InputListing\:tempa
 \NewConfigure{lstinputlisting}{2}
 \def\:tempa#1{%
    \setbox\z@\hbox{{\lst at currstyle{\kern#1}}}%

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/mathjax-latex-4ht.4ht	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,5 +1,5 @@
-% mathjax-latex-4ht.sty (2021-12-02-14:01), generated from tex4ht-mathjax.tex
-% Copyright 2018-2021 TeX Users Group
+% mathjax-latex-4ht.4ht (2022-04-04-07:43), generated from tex4ht-mathjax.tex
+% Copyright 2018-2022 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-12-02-14:01}
+\immediate\write-1{version 2022-04-04-07:43}
 
 
 \ExplSyntaxOn
@@ -52,7 +52,7 @@
 \newcommand\VerbMath[1]{%
   \cs_if_exist:cTF{#1}{
     \RenewDocumentEnvironment{#1}{+!b}{%
-      \NoFonts\expandafter\VerbMathToks\expandafter{##1}{#1}\EndNoFonts%
+      \NoFonts\expandafter\VerbMathToks\expandafter{\detokenize{##1}}{#1}\EndNoFonts%
     }{}
   }{}%
 }
@@ -177,6 +177,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/minted.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/minted.4ht	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/minted.4ht	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,5 +1,5 @@
-% minted.4ht (2021-12-26-09:03), generated from tex4ht-4ht.tex
-% Copyright 2020-2021 TeX Users Group
+% minted.4ht (2022-04-04-07:43), generated from tex4ht-4ht.tex
+% Copyright 2022 TeX Users Group
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -16,16 +16,22 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-12-26-09:03}
+\immediate\write-1{version 2022-04-04-07:43}
 
+
 \NewConfigure{InlineCode}{2}
+% this is a hack to hide a newline that is produced, and which causes spurious space in the output
+\NewConfigure{MintedHideNewline}{2}
+\Configure{MintedHideNewline}{\HCode{<!--}}{\HCode{-->}}
 
 \def\:tempa#1{%
   \endgroup%
   \begingroup%
-  \Configure{BVerbatimInput}{\HCode{}}{}{}{}{}\a:InlineCode% The \HCode is necessary for correct paragraph handling
+  \Configure{BVerbatimInput}{\HCode{}\ht:special{t4ht@(}}% \HCode is necessary for correct paragraph handlingling
+  {\a:MintedHideNewline}{\ht:special{t4ht@)}}{}{}% also hide newline and spurious spaces
+  \a:InlineCode%
   \begingroup%
-  \o:minted at inline@iii:{#1}%
+  \o:minted at inline@iii:{#1}\b:MintedHideNewline%
   \b:InlineCode%
   \endgroup%
 }
@@ -42,6 +48,16 @@
   }
   {\b:MintedColorbg\medskip\noindent}
 
+% support for background color in Minted listings
+\NewConfigure{MintedColorbg}{2}
+\renewenvironment{minted at colorbg}[1]{%
+  \colorlet{shadecolor}{#1}%
+  \extractcolorspec{shadecolor}{\:tempa}%
+  \expandafter\convertcolorspec\:tempa{HTML}\minted:bgcolor%
+  \a:MintedColorbg%
+  }
+  {\b:MintedColorbg\medskip\noindent}
+
 \NewConfigure{mintedfixes}[1]{\concat:config\a:mintedfixes{#1}}
 \let\a:mintedfixes\empty
 

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,4 +1,4 @@
-% ooffice.4ht (2022-02-06-13:26), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2022-04-04-07:07), generated from tex4ht-ooffice.tex
 % Copyright 2009-2022 TeX Users Group
 % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2022-02-06-13:26}
+\immediate\write-1{version 2022-04-04-07:07}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -7015,7 +7015,7 @@
 \NewConfigureOO{textsf}
 \ConfigureOO{textsf}{<style:style style:name="textsf" style:family="text">\Hnewline
    <style:text-properties fo:font-style="normal"
-                     fo:font-weight="bold"
+                     fo:font-weight="normal"
                      style:font-family-generic="swiss"
                      style:font-pitch="variable" />\Hnewline
 </style:style>\Hnewline
@@ -8160,6 +8160,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsbook}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8188,7 +8189,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsmath}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8207,6 +8207,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{babel}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8225,7 +8226,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ngerman}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8245,6 +8245,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{plain}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8512,6 +8513,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{url}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8568,6 +8570,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{hyperref}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8586,7 +8589,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{longtable}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8619,6 +8621,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{tabularx}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8649,6 +8652,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{mwart}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -11450,7 +11454,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{mwbk}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12862,6 +12865,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{csquotes}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12879,6 +12883,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{german}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12902,6 +12907,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{fancyvrb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -12932,7 +12938,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{color}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13125,6 +13130,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{verse}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13249,8 +13255,6 @@
 
 
 
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{frenchb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13270,8 +13274,6 @@
 
 
 
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{apacite}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13297,6 +13299,9 @@
 
 
 
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{wrapfig}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14860,7 +14865,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scrartcl}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16197,6 +16201,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{scrreprt}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -17805,7 +17810,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{apa}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -17972,6 +17976,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{g-brief}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18249,7 +18254,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{jurabib}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18295,6 +18299,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{slides}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18580,7 +18585,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pstricks}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18604,6 +18608,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{pst-all}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -18893,6 +18898,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{enumerate}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19030,7 +19036,6 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{cgloss4e}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19085,6 +19090,7 @@
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{covington}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19364,7 +19370,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ulem}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19898,7 +19903,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{footmisc}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -19998,7 +20002,6 @@
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{soul}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20147,6 +20150,7 @@
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{framed}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -20187,5 +20191,6 @@
 
 
 
+
 \endinput
 

Added: trunk/Master/texmf-dist/tex/generic/tex4ht/subfiles.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/subfiles.4ht	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/subfiles.4ht	2022-04-04 14:45:45 UTC (rev 62897)
@@ -0,0 +1,43 @@
+% subfiles.4ht (2022-04-04-07:06), generated from tex4ht-4ht.tex
+% Copyright 2022 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 <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2022-04-04-07:06}
+
+\def\:tempa#1{%
+  \ifcsname subfiles at end\endcsname
+  \else
+    \subfiles at saveEndTo\subfiles at end
+  \fi
+  \let\choose:begin\@secondoftwo
+  \expandafter\def\csname end \endcsname##1{%
+    \romannumeral
+    \subfiles at StrIfEqTF{##1}{document}{%
+      \z@
+      \subfiles at restoreEndFrom\subfiles at end
+      #1%
+    }{%
+      \expandafter\expandafter\expandafter\z@\subfiles at end{##1}%
+    }%
+  }%
+}
+
+\HLet\subfiles at renewEndDocument\:tempa
+
+\Hinput{subfiles}
+\endinput
+


Property changes on: trunk/Master/texmf-dist/tex/generic/tex4ht/subfiles.4ht
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty	2022-04-03 23:01:49 UTC (rev 62896)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty	2022-04-04 14:45:45 UTC (rev 62897)
@@ -1,8 +1,8 @@
 \ifnum\the\catcode`\%=14\else\expandafter\edef\csname
   \string:RestoreCatcodes\endcsname{\catcode`\%\the
   \catcode`\%}\catcode`\%14\fi
-% tex4ht.sty (2021-09-14-14:11), generated from tex4ht-sty.tex
-% Copyright 2009-2021 TeX Users Group
+% tex4ht.sty (2022-04-04-07:06), generated from tex4ht-sty.tex
+% Copyright 2009-2022 TeX Users Group
 % Copyright 1996-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -20,7 +20,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2021-09-14-14:11}
+\immediate\write-1{version 2022-04-04-07:06}
 
 
 \ifx  \Preamble\UnDef  \else
@@ -579,18 +579,25 @@
    \ifx \config:opt\:UnDef \else
   \append:def\:RestoreCatcodes{\early:sub\early:sup}
 \let\:IfFileExists\IfFileExists
-\long\def\IfFileExists#1#2#3{%
-   \csname recall:sub\endcsname
-   \csname recall:sup\endcsname
-   \expandafter\let\csname #1:sub\endcsname=\early:sub
-   \expandafter\let\csname #1:sup\endcsname=\early:sup
-   \let\early:sub=\relax     \let\recall:sub\relax
-   \let\early:sup=\relax     \let\recall:sup\relax
-   \:IfFileExists{#1}{#2}{#3}%
-   \expandafter\let\expandafter\early:sub\csname #1:sub\endcsname
-   \expandafter\let\expandafter\early:sup\csname #1:sup\endcsname
-   \early:sub \early:sup
-}
+
+% I am not sure why we used this declaration. It is from the original
+% TeX4ht sources, so it probably had some reason. The problem is that it
+% inserts extra tokens after \:IfFileExists, and if some package uses
+% something like \IfFileExists{foo.sty}{\@firstoftwo}{\@secondoftwo}{aa}{bb},
+% then it fails. I've found this issue with the Standalone class.
+% See https://tex.stackexchange.com/a/638965/2891 for example where it fails.
+% \long\def\IfFileExists#1#2#3{%
+%    \csname recall:sub\endcsname
+%    \csname recall:sup\endcsname
+%    \expandafter\let\csname #1:sub\endcsname=\early:sub
+%    \expandafter\let\csname #1:sup\endcsname=\early:sup
+%    \let\early:sub=\relax     \let\recall:sub\relax
+%    \let\early:sup=\relax     \let\recall:sup\relax
+%    \:IfFileExists{#1}{#2}{#3}%
+%    \expandafter\let\expandafter\early:sub\csname #1:sub\endcsname
+%    \expandafter\let\expandafter\early:sup\csname #1:sup\endcsname
+%    \early:sub \early:sup
+% }
 \ifx \o:document\:UnDef
    \pend:def\Preamble{%
      \csname recall:sub\endcsname



More information about the tex-live-commits mailing list.