diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-09 21:38:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-09 21:38:09 +0000 |
commit | f87b85f4e87c9617ea2120ab84e9b512a0789d9f (patch) | |
tree | ffd8a2125d956cbd465fb6761533f1f702c5daaf /Master | |
parent | 2214af530f51d678e1e121ac55c9d635813abea0 (diff) |
bookmark fixes, tex4ht r1172; font cmds vs. mathml, tex4ht r1174
git-svn-id: svn://tug.org/texlive/trunk@63857 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
7 files changed, 159 insertions, 39 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index e6939da8cc2..bebf8a70a5b 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/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/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile index 3c48521b3d7..01a6b62e903 100644 --- a/Master/texmf-dist/source/generic/tex4ht/Makefile +++ b/Master/texmf-dist/source/generic/tex4ht/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/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 753ebab863d..abba9548e60 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 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/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} diff --git a/Master/texmf-dist/tex/generic/tex4ht/bookmark-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/bookmark-hooks.4ht new file mode 100644 index 00000000000..23823745dc7 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/bookmark-hooks.4ht @@ -0,0 +1,24 @@ +% bookmark-hooks.4ht (2022-07-07-14:08), 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-07-07-14:08} + +\PassOptionsToPackage{draft}{bookmark} + +\endinput + diff --git a/Master/texmf-dist/tex/generic/tex4ht/jats.4ht b/Master/texmf-dist/tex/generic/tex4ht/jats.4ht index a8cb8751da6..c2643a6955c 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-06-29-13:40), generated from tex4ht-jats.tex +% jats.4ht (2022-07-08-09:28), generated from tex4ht-jats.tex % Copyright 2022 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,7 +16,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-06-29-13:40} +\immediate\write-1{version 2022-07-08-09:28} \exit:ifnot{amsart,% amsbook,% @@ -236,23 +236,7 @@ url} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{latex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \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} + \Configure{underline} {\HCode{<underline>}\:gobble} {\HCode{</underline>}} @@ -264,6 +248,46 @@ url} {\HCode{<sub>}} {\HCode{</sub>}} +% We must override MathML's version of basic font commands. +\AtBeginDocument{% +\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}% + +} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index c31a7a4b9d2..c97ffdbe462 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2022-06-14-13:41), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-07-07-14:08), generated from tex4ht-4ht.tex % Copyright 2003-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-06-14-13:41} +\immediate\write-1{version 2022-07-07-14:08} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} @@ -66,6 +66,7 @@ \Configure{PackageHooks}{pdfx.sty}{pdfx-hooks.4ht} \Configure{PackageHooks}{breakurl.sty}{breakurl-hooks.4ht} \Configure{PackageHooks}{hyperref.sty}{hyperref-hooks.4ht} +\Configure{PackageHooks}{bookmark.sty}{bookmark-hooks.4ht} \Configure{PackageHooks}{caption.sty}{caption-hooks.4ht} \Configure{PackageHooks}{minted.sty}{minted-sty-hooks.4ht} \Configure{PackageHooks}{graphics.sty}{graphics-hooks.4ht} |