bookmark fixes, tex4ht r1172; font cmds vs. mathml, tex4ht r1174

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

1 files changed, 47 insertions, 16 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex
index e969844c70b..dc9ae8e5b99 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-jats.tex
@@ -73,8 +73,14 @@ https://jats.nlm.nih.gov/archiving/tag-library/1.3/chapter/getting-started.html
 
 \<configure jats latex\><<<
 |<latex fonts|>
+% We must override MathML's version of basic font commands.
+\AtBeginDocument{%
+|<mathml fonts|>
+}
 >>>
 
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Classes}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -453,22 +459,6 @@ about font name and size is lost.
 >>>
 
 \<latex fonts\><<<
-\Configure{textit}{\Protect\HCode{<italic>}\NoFonts}{\EndNoFonts\Protect\Tg</italic>}
-\Configure{textbf}{\Protect\HCode{<bold>}\NoFonts}{\EndNoFonts\Protect\Tg</bold>}
-\Configure{textsc}{\Protect\HCode{<sc>}\NoFonts}{\EndNoFonts\Protect\Tg</sc>}
-\Configure{textrm}{\Protect\HCode{<roman>}\NoFonts}
-                    {\EndNoFonts\Protect\HCode{</roman>}}
-\Configure{textup}{\Protect\HCode{<span class="textup">}\NoFonts}
-                    {\EndNoFonts\Protect\HCode{</span>}}  
-\Configure{textsf}{\Protect\HCode{<sans-serif>}\NoFonts}
-                    {\EndNoFonts\Protect\HCode{</sans-serif>}}  
-\Configure{textsl}{\Protect\HCode{<italic>}\NoFonts}
-                    {\EndNoFonts\Protect\HCode{</italic>}}
-\Configure{texttt}{\Protect\HCode{<monospace>}\NoFonts}
-                    {\EndNoFonts\Protect\HCode{</monospace>}}
-\Configure{emph}{\Protect\HCode{<italic>}\NoFonts}
-                    {\EndNoFonts\Protect\HCode{</italic>}}
-
 \Configure{underline}
    {\HCode{<underline>}\:gobble}
    {\HCode{</underline>}}
@@ -482,6 +472,47 @@ about font name and size is lost.
   {\HCode{</sub>}}
 >>>
 
+The basic font commands are redefined in mathml.4ht, so we need to redefine them again 
+
+\<mathml fonts\><<<
+\Configure{texttt}
+   {\ifmathml\providemtextclass{\mml:class="texttt"
+         mathvariant="monospace" }\else\Protect\HCode{<monospace>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</monospace>}\fi}%
+\Configure{textit}
+   {\ifmathml \providemtextclass{\mml:class="textit"
+         mathvariant="italic" }\else\Protect\HCode{<italic>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</italic>}\fi}%
+\Configure{textrm}
+   {\ifmathml \providemtextclass{\mml:class="textrm"
+         mathvariant="normal" }\else\Protect\HCode{<roman>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</roman>}\fi}%
+\Configure{textup}
+   {\ifmathml \providemtextclass{\mml:class="textup"
+         mathvariant="normal" }\else\Protect\HCode{<roman>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</roman>}\fi}%
+\Configure{textsl}
+   {\ifmathml \providemtextclass{\mml:class="textsl"
+         mathvariant="italic" }\else\Protect\HCode{<italic>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</italic>}\fi}%
+\Configure{textsf}
+   {\ifmathml \providemtextclass{\mml:class="textsf"
+         mathvariant="sans-serif" }\else\Protect\HCode{<sans-serif>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</sans-serif>}\fi}%
+\Configure{textbf}
+   {\ifmathml \providemtextclass{\mml:class="textbf"
+         mathvariant="bold" }\else\Protect\HCode{<bold>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</bold>}\fi}%
+\Configure{textsc}
+   {\ifmathml \providemtextclass{\mml:class="textsc"
+         mathvariant="normal" }\else\Protect\HCode{<sc>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</sc>}\fi}%
+\Configure{emph}
+   {\ifmathml \providemtextclass{\mml:class="emph"
+         mathvariant="italic" }\else\Protect\HCode{<italic>}\NoFonts\fi}
+   {\ifmathml\else\EndNoFonts\Protect\HCode{</italic>}\fi}%
+>>>
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \chapter{Document structure}