summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht8
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/jats.4ht276
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathml.4ht21
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht84
4 files changed, 243 insertions, 146 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 17fee6e5a2e..4fb9be27d17 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -1,4 +1,4 @@
-% html4.4ht (2024-02-14-09:16), generated from tex4ht-html4.tex
+% html4.4ht (2024-02-21-13:34), generated from tex4ht-html4.tex
% Copyright 2009-2024 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 2024-02-14-09:16}
+\immediate\write-1{version 2024-02-21-13:34}
\exit:ifnot{8859-6,%
CJK,%
@@ -40731,13 +40731,13 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{mhchem}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- \typeout{***************** hello mhchem}
-\Configure{mhchemcf}{\HCode{<span class="mhchem">}}{\HCode{</span>}}
+ \Configure{mhchemcf}{\HCode{<span class="mhchem">}}{\HCode{</span>}}
\Configure{mhchemce}{\HCode{<span class="mhchem">}}{\HCode{</span>}}
\Configure{mhchemisotope}{\HCode{<span class="mhchem-isotope">}}{\HCode{<br />&\#xfeff;}}{\HCode{</span>}}
\Configure{mhchemsub}{\HCode {<sub class="mhchem-sub">}}{\HCode{</sub>} }
\Configure{mhchemsup}{\HCode {<sup class="mhchem-sup">}}{\HCode{</sup>} }
+\Configure{mhchemsupsub}{\HCode{<span class="mhchem-supsub">}}{\HCode{<br />&\#xfeff;}}{\HCode{</span>}}
% mhchemoperator is always used inside \HCode, so we need not to use \HCode in it's configuration
\Configure{mhchemoperator}{<span class="mhchem-operator">}{</span>}
\Configure{mhchemarrow}{\HCode {<span class="mhchem-arrow">}}{\HCode{</span>}}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/jats.4ht b/Master/texmf-dist/tex/generic/tex4ht/jats.4ht
index c2643a6955c..9f9d444eb03 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/jats.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/jats.4ht
@@ -1,4 +1,4 @@
-% jats.4ht (2022-07-08-09:28), generated from tex4ht-jats.tex
+% jats.4ht (2024-02-22-13:42), generated from tex4ht-jats.tex
% Copyright 2022 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,12 +16,13 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-07-08-09:28}
+\immediate\write-1{version 2024-02-22-13:42}
\exit:ifnot{amsart,%
amsbook,%
amsproc,%
article,%
+biblatex,%
book,%
hyperref,%
latex,%
@@ -45,7 +46,9 @@ url}
\NewConfigure{DtdVersion}{1}
\Configure{DtdVersion}{1.3}
-\Configure{DOCTYPE}{\HCode{<!DOCTYPE article PUBLIC "-//NLM//DTD JATS (Z39.96) Journal Publishing DTD v\a:DtdVersion\space 20130915//EN" "http://jats.nlm.nih.gov/archiving/\a:DtdVersion/JATS-archivearticle1-mathml3.dtd">\Hnewline}}
+\def\:DTD{jats} % this is necessary to prevent html-mml from overriding DOCTYPE
+%
+\Configure{DOCTYPE}{\HCode{<!DOCTYPE article PUBLIC "-//NLM//DTD JATS (Z39.96) Journal Archiving and Interchange DTD v\a:DtdVersion\space 20210610//EN" "JATS-archivearticle1-3.dtd">\Hnewline}}
% XML configuratins
\edef\html:xmlns{}
@@ -333,7 +336,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -346,7 +349,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -359,7 +362,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -372,32 +375,32 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likeparagraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -486,7 +489,7 @@ url}
\Configure{chapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{chapter}
@@ -497,7 +500,7 @@ url}
\Configure{appendix}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{appendix}{\HCode{<label>}%
@@ -506,7 +509,7 @@ url}
\Configure{likechapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -556,7 +559,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -569,7 +572,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -582,7 +585,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -595,32 +598,32 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likeparagraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -718,7 +721,7 @@ url}
\Configure{chapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{chapter}
@@ -729,7 +732,7 @@ url}
\Configure{appendix}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{appendix}{\HCode{<label>}%
@@ -738,7 +741,7 @@ url}
\Configure{likechapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -788,7 +791,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -801,7 +804,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -814,7 +817,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -827,32 +830,32 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likeparagraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -967,6 +970,8 @@ url}
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsart}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1005,7 +1010,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -1018,7 +1023,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -1031,7 +1036,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -1044,7 +1049,7 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -1143,7 +1148,6 @@ url}
\endinput\empty\empty\empty\empty\empty\empty
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{amsbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1182,7 +1186,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -1195,7 +1199,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -1208,7 +1212,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -1221,7 +1225,7 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -1316,7 +1320,7 @@ url}
\Configure{chapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{chapter}
@@ -1327,7 +1331,7 @@ url}
\Configure{appendix}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{appendix}{\HCode{<label>}%
@@ -1378,7 +1382,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -1391,7 +1395,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -1404,7 +1408,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -1417,7 +1421,7 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -1512,7 +1516,7 @@ url}
\Configure{chapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{chapter}
@@ -1523,7 +1527,7 @@ url}
\Configure{appendix}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{appendix}{\HCode{<label>}%
@@ -1555,7 +1559,59 @@ url}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \ConfigureHinput{biblatex}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \def\bibConfigure{%
+ \ConfigureList{thebibliography}
+ {\ifvmode \IgnorePar \fi \EndP \EndP
+ \HCode{<ref-list>}\HtmlParOff%
+ \immediate\write\@auxout{%
+ \string\providecommand\string\BibFileName[2][]{}
+ }%
+ \immediate\write\@auxout{%
+ \string\BibFileName[\therefsection]{\FileName}}%
+ \PushMacro \end:itm \global \let \end:itm =\empty}%
+ {\ifvmode \IgnorePar \fi \EndP
+ \PopMacro \end:itm \global \let \end:itm \end:itm \EndP
+ \HCode {</mixed-citation></ref></ref-list>}\HtmlParOn\ShowPar}%
+ {\ifvmode \IgnorePar \fi \EndP \gHAdvance \bibN by 1
+ \end:itm \global \def \end:itm {\EndP \HCode{</mixed-citation></ref>}}%
+ \Tag{X\therefsection-\abx@field@entrykey}{bibitem-\bibN}
+ \HCode {<ref id="bibitem-\bibN"><label>}}%
+ {\ifvmode \IgnorePar \fi \EndP
+ \HCode {</label><mixed-citation publication-type="\thefield{entrytype}" id="bib-\bibN">}}%
+}
+\DeclareFieldFormat{title}{\HCode{<source>}#1\HCode{</source>}}
+\DeclareFieldFormat{booktitle}{\HCode{<source>}#1\HCode{</source>}}
+\DeclareFieldFormat{maintitle}{\HCode{<source>}#1\HCode{</source>}}
+\DeclareFieldFormat{journaltitle}{\HCode{<source>}#1\HCode{</source>}}
+\DeclareFieldFormat[article]{title}{\HCode{<article-title>}#1\HCode{</article-title>}}
+\DeclareFieldFormat[incollection]{title}{\HCode{<part-title>}#1\HCode{</part-title>}}
+\DeclareFieldFormat[inbook]{title}{\HCode{<part-title>}#1\HCode{</part-title>}}
+\DeclareFieldFormat{year}{\HCode{<year>}#1\HCode{</year>}}
+\DeclareFieldFormat{date}{\HCode{<date-in-citation content-type="published">}#1\HCode{</date-in-citation>}}
+\DeclareFieldFormat{pages}{\HCode{<page-range>}#1\HCode{</page-range>}}
+\DeclareListFormat{publisher}{\usebibmacro{list:delim}{#1}\HCode{<publisher-name>}#1\HCode{</publisher-name>}\isdot\usebibmacro{list:andothers}}
+\DeclareListFormat{location}{\usebibmacro{list:delim}{#1}\HCode{<publisher-loc>}#1\HCode{</publisher-loc>}\isdot\usebibmacro{list:andothers}}
+\DeclareNameFormat{author}{%
+ \nameparts{#1}% This command initializes commands used in the following bibmacro
+ \HCode{<string-name>}% use
+ \usebibmacro{name:family-given}%
+ {\namepartfamily}%
+ {\namepartgiveni}%
+ {\namepartprefix}%
+ {\namepartsuffix}%
+ \HCode{</string-name>}%
+ \usebibmacro{name:andothers}%
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1669,6 +1725,15 @@ url}
+
+
+
+
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{memoir}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1707,7 +1772,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -1720,7 +1785,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -1733,7 +1798,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -1746,32 +1811,32 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likeparagraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -1867,7 +1932,7 @@ url}
\Configure{chapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{chapter}
@@ -1878,7 +1943,7 @@ url}
\Configure{appendix}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{appendix}{\HCode{<label>}%
@@ -1887,7 +1952,7 @@ url}
\Configure{likechapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -1965,6 +2030,17 @@ url}
+
+
+
+
+
+
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{scrbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2003,7 +2079,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -2016,7 +2092,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -2029,7 +2105,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -2042,32 +2118,32 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likeparagraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -2156,7 +2232,7 @@ url}
\Configure{chapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{chapter}
@@ -2167,7 +2243,7 @@ url}
\Configure{appendix}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{appendix}{\HCode{<label>}%
@@ -2176,7 +2252,7 @@ url}
\Configure{likechapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -2226,7 +2302,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -2239,7 +2315,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -2252,7 +2328,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -2265,32 +2341,32 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likeparagraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -2430,7 +2506,7 @@ url}
\Configure{section}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{section}
@@ -2443,7 +2519,7 @@ url}
\Configure{subsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsection}
@@ -2456,7 +2532,7 @@ url}
\Configure{subsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{subsubsection}
@@ -2469,32 +2545,32 @@ url}
\Configure{paragraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likesubsubsection}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\Configure{likeparagraph}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -2592,7 +2668,7 @@ url}
\Configure{chapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{chapter}
@@ -2603,7 +2679,7 @@ url}
\Configure{appendix}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\TitleMark\HCode{<title>}\space\HtmlParOff}
+ {\TitleMark\space\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
\ConfigureMark{appendix}{\HCode{<label>}%
@@ -2612,7 +2688,7 @@ url}
\Configure{likechapter}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{<sec>\Hnewline}}
{\ifvmode\IgnorePar\fi\EndP\IgnorePar\HCode{</sec>\Hnewline}}
- {\HCode{<title>}\space\HtmlParOff}
+ {\HCode{<title>}\HtmlParOff}
{\HCode{</title>}\HtmlParOn \ShowPar\par}
@@ -2883,5 +2959,23 @@ url}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index db1a567102f..60b81aa11c7 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,4 +1,4 @@
-% mathml.4ht (2024-02-19-13:18), generated from tex4ht-mathml.tex
+% mathml.4ht (2024-02-21-13:34), generated from tex4ht-mathml.tex
% Copyright 2009-2024 TeX Users Group
% Copyright 1999-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-02-19-13:18}
+\immediate\write-1{version 2024-02-21-13:34}
\exit:ifnot{Preamble,%
accents,%
@@ -4392,23 +4392,26 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
\Configure{mhchemcf}{\HCode{<\:mhmathmlorhtml{mrow}{span}\space class="mhchem-cf">}}{\HCode{</\:mhmathmlorhtml{mrow}{span}>}}
\Configure{mhchemce}{\HCode{<\:mhmathmlorhtml{mrow}{span}\space class="mhchem-ce">}}{\HCode{</\:mhmathmlorhtml{mrow}{span}>}}
+% we configure subscripts and superscripts to have empty bases. it is because if superscript followed subscript, we got wrong
+% MathML markup, with mismatched tags. For example: \ce{CrO4^2-}
\Configure{mhchemsub}{%
\:mhmathmlorhtml{%
- \Send{BACK}%
- {<\a:mathml msub><\a:mathml mrow\Hnewline>}%
- \Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>\trap:base%
+ \HCode{<\a:mathml msub><mrow></mrow><\a:mathml mrow>}%
}{%
\HCode{<sub>}}%
-}{\:mhmathmlorhtml{\Tg</\a:mathml mrow>\TG</\a:mathml msub\Hnewline>}{\HCode{</sub>}}}
+}{\:mhmathmlorhtml{\Tg</\a:mathml mrow>\TG</\a:mathml msub>}{\HCode{</sub>}}}
\Configure{mhchemsup}{%
\:mhmathmlorhtml{
- \Send{BACK}
- {<\a:mathml msup><\a:mathml mrow\Hnewline>}%
- \Tg</\a:mathml mrow>\Tg<\a:mathml mrow\Hnewline>\trap:base
+ \HCode{<\a:mathml msup><mrow></mrow><\a:mathml mrow>}%
}{%
\HCode{<sup>}}%
}{\:mhmathmlorhtml{\Tg</\a:mathml mrow>\TG</\a:mathml msup\Hnewline>}{\HCode{</sup>}}}
+
+\Configure{mhchemsupsub}{\setbox0=\hbox\bgroup}{\egroup\setbox1=\hbox\bgroup}{\egroup\HCode{<\a:mathml msubsup><\a:mathml mrow></\a:mathml mrow><\a:mathml mrow>}\box1\HCode{</\a:mathml mrow><\a:mathml mrow>}\box0\HCode{</\a:mathml mrow></\a:mathml msubsup>}}
+\Configure{mhchemisotope}{\setbox0=\hbox\bgroup}{\egroup\setbox1=\hbox\bgroup}{\egroup\HCode{<\a:mathml msubsup><\a:mathml mrow></\a:mathml mrow><\a:mathml mrow>}\box1\HCode{</\a:mathml mrow><\a:mathml mrow>}\box0\HCode{</\a:mathml mrow></\a:mathml msubsup>}}
+
+
% mhchemoperator is always used inside \HCode, so we need not to use \HCode in it's configuration
\Configure{mhchemoperator}{<\:mhmathmlorhtml{mo}{span} class="mhchem-operator">}{</\:mhmathmlorhtml{mo}{span}>}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht b/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht
index 6c298dbbfa4..674c7cf9097 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mhchem.4ht
@@ -1,4 +1,4 @@
-% mhchem.4ht (2024-02-07-13:12), generated from tex4ht-4ht.tex
+% mhchem.4ht (2024-02-21-13:34), generated from tex4ht-4ht.tex
% Copyright 2024 TeX Users Group
% Copyright 2015-2021 Martin Hensel
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-02-07-13:12}
+\immediate\write-1{version 2024-02-21-13:34}
\ExplSyntaxOn
% basic mhchem containers
@@ -37,6 +37,8 @@
\NewConfigure{mhchemsup}{2}
+\NewConfigure{mhchemsupsub}{3}
+
\cs_set_protected:Npn \__mhchem_output_coreFivefourht:nnnnnnn #1#2#3#4#5#6#7
{
\bool_if:nT
@@ -71,11 +73,11 @@
\b:mhchemsup
}
{
- \HCode { <span~class="mhchem-supsub"> }
+ \a:mhchemsupsub
\__mhchem_output_withFont:n { #4#5#7 }
- \HCode { <br~/>&\#xfeff; }
+ \c:mhchemsupsub
\__mhchem_output_withFont:n { #6 }
- \HCode { </span> }
+ \b:mhchemsupsub
}
}
}
@@ -104,58 +106,56 @@
% replace original coreFive with our alternative version. it will work in picture math
\HLet\__mhchem_output_coreFive:nnnnnnn\__mhchem_output_coreFivefourht:nnnnnnn
-\cs_set_protected:Npn \__mhchem_output_withFont:n #1 %. output #1 as math or text
+\cs_set_protected:Npn \__mhchem_output_withFontfourht:n #1 %. output #1 as math or text
{
\bool_if:NTF \l__mhchem_output_isMathMode_bool
{ \begingroup\mathrm {#1}\endgroup }
{ \begingroup\text {#1}\endgroup }
}
+\HLet\__mhchem_output_withFont:n\__mhchem_output_withFontfourht:n
+
\NewConfigure{mhchemoperator}{2}
-% ideally, the following commands should be redefined using \HLet, to support picture math.
-% the current definition should work in MathML, I am not sure about normall HTML, as
-\cs_set_protected:Npn \__mhchem_output_skipAfterAmount: {\HCode { ~ } } % space for copy & paste
-\cs_set_protected:Npn \__mhchem_output_skipBeforeStateOfAggregation: {}
-\cs_set_protected:Npn \__mhchem_output_minus: {\HCode{&\#x2212;}} % minus
-\cs_set_protected:Npn \__mhchem_output_operatorPlus:
- { \HCode {\a:mhchemoperator + \b:mhchemoperator }}
-\cs_set_protected:Npn \__mhchem_output_operatorMinus:
- { \HCode {\a:mhchemoperator&\#x2212; \b:mhchemoperator }} % minus
-\cs_set_protected:Npn \__mhchem_output_operatorEquals:
- { \HCode {\a:mhchemoperator = \b:mhchemoperator }}
-\cs_set_protected:Npn \__mhchem_output_operatorPlusMinus:
- {\HCode {\a:mhchemoperator &\#xB1; \b:mhchemoperator }} % plusmn
-\cs_set_protected:Npn \__mhchem_output_electronDot: { \HCode {&\#x2022;} } % bull
-\cs_set_protected:Npn \__mhchem_output_additionCompound: { \HCode {&\#xB7;} } % middot
-\cs_set_protected:Npn \__mhchem_output_excited: { \HCode { &\#x2731; } }
-\cs_set_protected:Npn \__mhchem_output_commaDecimal: { , }
-\cs_set_protected:Npn \__mhchem_output_commaEnumeration: {,\HCode {&\#x2009;} } % thinsp
-\cs_set_protected:Npn \__mhchem_output_commaEnumerationSmall: {,\HCode{&\#x2009;} } % thinsp
-
-\cs_set_protected:Npn \__mhchem_output_bond_single: { \HCode { \a:mhchemoperator&\#x2212;\b:mhchemoperator}}
-\cs_set_protected:Npn \__mhchem_output_bond_double: { \HCode { \a:mhchemoperator=\b:mhchemoperator}}
-\cs_set_protected:Npn \__mhchem_output_bond_triple: { \HCode { \a:mhchemoperator&\#x2261;\b:mhchemoperator}}
+\def\:tempa#1#2{%
+ \cs_set_protected:Npn\:tempb:{#2}%
+ \HLet#1\:tempb:%
+}
+
+\:tempa \__mhchem_output_skipAfterAmount: {\HCode { ~ } } % space for copy & paste
+\:tempa \__mhchem_output_skipBeforeStateOfAggregation: {}
+\:tempa \__mhchem_output_minus: {\HCode{&\#x2212;}} % minus
+\:tempa \__mhchem_output_operatorPlus:{ \HCode {\a:mhchemoperator + \b:mhchemoperator }}
+\:tempa \__mhchem_output_operatorMinus:{ \HCode {\a:mhchemoperator&\#x2212; \b:mhchemoperator }} % minus
+\:tempa \__mhchem_output_operatorEquals:{ \HCode {\a:mhchemoperator = \b:mhchemoperator }}
+\:tempa \__mhchem_output_operatorPlusMinus:{\HCode {\a:mhchemoperator &\#xB1; \b:mhchemoperator }} % plusmn
+\:tempa \__mhchem_output_electronDot: { \HCode {&\#x2022;} } % bull
+\:tempa \__mhchem_output_additionCompound: { \HCode {&\#xB7;} } % middot
+\:tempa \__mhchem_output_excited: { \HCode { &\#x2731; } }
+\:tempa \__mhchem_output_commaDecimal: { , }
+\:tempa \__mhchem_output_commaEnumeration: {,\HCode {&\#x2009;} } % thinsp
+\:tempa \__mhchem_output_commaEnumerationSmall: {,\HCode{&\#x2009;} } % thinsp
+
+\:tempa \__mhchem_output_bond_single: { \HCode { \a:mhchemoperator&\#x2212;\b:mhchemoperator}}
+\:tempa \__mhchem_output_bond_double: { \HCode { \a:mhchemoperator=\b:mhchemoperator}}
+\:tempa \__mhchem_output_bond_triple: { \HCode { \a:mhchemoperator&\#x2261;\b:mhchemoperator}}
% todo: add MathML support for these
-\cs_set_protected:Npn \__mhchem_output_bond_half: % todo: improve
- {\a:mhchembondhalf}
-\cs_set_protected:Npn \__mhchem_output_bond_oneAndHalf: % todo: improve
- {\a:mhchembondoneandhalf}
-\cs_set_protected:Npn \__mhchem_output_bond_twoAndHalf: % todo: improve
- {\a:mhchembondtwoandhalf}
-\cs_set_protected:Npn \__mhchem_output_bond_twoAndHalff: % todo: improve
- {\a:mhchembondtwoandhalff}
+\:tempa \__mhchem_output_bond_half:{\a:mhchembondhalf}
+\:tempa \__mhchem_output_bond_oneAndHalf:{\a:mhchembondoneandhalf}
+\:tempa \__mhchem_output_bond_twoAndHalf:{\a:mhchembondtwoandhalf}
+\:tempa \__mhchem_output_bond_twoAndHalff:{\a:mhchembondtwoandhalff}
+
+\:tempa \__mhchem_output_bond_dotdotdot: { \HCode { &\#xB7;&\#xB7;&\#xB7;} } % &middot;&middot;&middot;
+\:tempa \__mhchem_output_bond_dotdotdotdot: { \HCode { &\#xB7;&\#xB7;&\#xB7;&\#xB7;} } % &middot;&middot;&middot;&middot;
+\:tempa \__mhchem_output_bond_rightArrow: { \HCode { &\#xffeb; } }
+\:tempa \__mhchem_output_bond_leftArrow: { \HCode { &\#xffe9; } }
+
\NewConfigure{mhchembondhalf}{1}
\NewConfigure{mhchembondoneandhalf}{1}
\NewConfigure{mhchembondtwoandhalf}{1}
\NewConfigure{mhchembondtwoandhalff}{1}
-\cs_set_protected:Npn \__mhchem_output_bond_dotdotdot: { \HCode { &\#xB7;&\#xB7;&\#xB7;} } % &middot;&middot;&middot;
-\cs_set_protected:Npn \__mhchem_output_bond_dotdotdotdot: { \HCode { &\#xB7;&\#xB7;&\#xB7;&\#xB7;} } % &middot;&middot;&middot;&middot;
-\cs_set_protected:Npn \__mhchem_output_bond_rightArrow: { \HCode { &\#xffeb; } }
-\cs_set_protected:Npn \__mhchem_output_bond_leftArrow: { \HCode { &\#xffe9; } }
-
\NewConfigure{mhchemarrow}{2}