diff options
author | Norbert Preining <norbert@preining.info> | 2022-07-10 03:00:39 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-07-10 03:00:39 +0000 |
commit | 20ce5b015c76436ed3c8022b778a877bcf4852dd (patch) | |
tree | 1f3e497cdfb61208cb0bbc703320a6df0c2e9d63 /support | |
parent | 7891283a2f2fb8a8a884bb212c36da8082764a9b (diff) |
CTAN sync 202207100300
Diffstat (limited to 'support')
-rw-r--r-- | support/TeX4ht/source/ChangeLog | 12 | ||||
-rw-r--r-- | support/TeX4ht/source/Makefile | 9 | ||||
-rw-r--r-- | support/TeX4ht/source/tex4ht-4ht.tex | 23 | ||||
-rw-r--r-- | support/TeX4ht/source/tex4ht-jats.tex | 63 |
4 files changed, 89 insertions, 18 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index e6939da8cc..bebf8a70a5 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,15 @@ +2022-07-08 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-jats.tex (jats.4ht): overwrite MathML redefinitions for + basic font commands configurations. + +2022-07-07 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-fonts-mnsymbol.tex: added support for the MnSymbol fonts. + * tex4ht-4ht.tex (usepackage.4ht, bookmark-hooks.4ht): prevent + errors with the Bookmark package. + https://tex.stackexchange.com/a/650128/2891 + 2022-07-05 Karl Berry <karl@freefriends.org> * Makefile (tex4ht_4ht_derived): add texpower. diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile index 3c48521b3d..01a6b62e90 100644 --- a/support/TeX4ht/source/Makefile +++ b/support/TeX4ht/source/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 1171 2022-07-05 21:29:31Z karl $ +# $Id: Makefile 1173 2022-07-07 13:29:07Z michal_h21 $ # This file is public domain. Originally written 2010, Karl Berry. # Assumes GNU make. @@ -219,6 +219,10 @@ tex4ht_fonts_opensans_derived = \ # xx and many more # whither tmp? how change target dir? what happened to cmtex.htf? etc. +derived += $(tex4ht_fonts_mnsymbol_derived) +tex4ht_fonts_mnsymbol_derived = \ + $(ht_fonts_devdir)/unicode/MnSymbol/MnSymbolA-Bold10.htf + # htcmd not used #derived += $(tex4ht_htcmd_derived) #tex4ht_htcmd_derived = htcmd.c @@ -438,6 +442,9 @@ $(tex4ht_fonts_kpfonts_derived): tex4ht-fonts-kpfonts.tex $(tex4ht_fonts_opensans_derived): tex4ht-fonts-opensans.tex $(HTTEX) $< "" +$(tex4ht_fonts_mnsymbol_derived): tex4ht-fonts-mnsymbol.tex + $(HTTEX) $< "" + # requires more memory than configured in other tex programs. $(tex4ht_fonts_4hf): tex4ht-fonts-4hf.tex dvilualatex $< diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 753ebab863..abba9548e6 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1171 2022-07-05 21:29:31Z karl $ +% $Id: tex4ht-4ht.tex 1172 2022-07-07 12:17:55Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -6220,6 +6220,27 @@ Hype: \hyperref[sec:foobar]{Link to Section \ref*{sec:foobar}} \EndVerbatim \EndHPage{}] +\Section{bookmark.sty} + +\<add to usepackage\><<< +\Configure{PackageHooks}{bookmark.sty}{bookmark-hooks.4ht} +>>> + +\<bookmark-hooks.4ht\><<< +% bookmark-hooks.4ht (|version), generated from |jobname.tex +% Copyright 2022 TeX Users Group +|<TeX4ht license text|> +|<pass draft mode to bookmark|> +\endinput +>>> \AddFile{9}{bookmark-hooks} + +The bookmark package redefines sectioning commands, biliography, etc., which we don't +want, as it clashes with TeX4ht. It is useful only in the PDF mode anayway. + +\<pass draft mode to bookmark\><<< +\PassOptionsToPackage{draft}{bookmark} +>>> + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Chapter{Miscellaneous Environments} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/support/TeX4ht/source/tex4ht-jats.tex b/support/TeX4ht/source/tex4ht-jats.tex index e969844c70..dc9ae8e5b9 100644 --- a/support/TeX4ht/source/tex4ht-jats.tex +++ b/support/TeX4ht/source/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} |