diff options
4 files changed, 60 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 731d18e0986..0a560ca3b67 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,13 @@ +2023-09-04 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-mathml.tex (mathml.4ht): fixed spacing in \limsup, + \liminf and few other two word operators. + https://github.com/michal-h21/make4ht/issues/133 + +2023-09-03 Karl Berry <karl@freefriends.org> + + * tex4ht-mkht.tex: ChangeLog. + 2023-08-31 Michal Hoftich <michal.h21@gmail.com> * tex4ht-html4.tex (html4.4ht): calculate padding for individual diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index 1af96d34dbe..a8cc0ec955f 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-mathml.tex 1356 2023-08-13 18:48:02Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1365 2023-09-04 14:49:39Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -2454,21 +2454,31 @@ reduced.) The original definitions for the following macros contain small spaces -\verb+\,+ in the names, and the spaces imply improper mathml outcome -of the form \verb+<mo>...<mspace.../>...</mo>+. +\verb+\,+ in the names, we need to use explicit tags to support them +correctly. + +See \Link{https://github.com/michal-h21/make4ht/issues/133}{}this report\EndLink +for more details. \<configure mathml amsopn\><<< -\def\:tempc{\qopname\relax m{lim inf}} +\def\:tempc{\qopname\relax m{\:limspaces{lim}{inf}}} \HLet\liminf=\:tempc -\def\:tempc{\qopname\relax m{lim sup}} +\def\:tempc{\qopname\relax m{\:limspaces{lim}{sup}}} \HLet\limsup=\:tempc -\def\:tempc{\qopname\relax m{proj lim}} +\def\:tempc{\qopname\relax m{\:limspaces{proj}{lim}}} \HLet\projlim=\:tempc -\def\:tempc{\qopname\relax m{inj lim}} +\def\:tempc{\qopname\relax m{\:limspaces{inj}{lim}}} \HLet\injlim=\:tempc >>> +\<configure mathml amsopn\><<< +\Configure{qopname} + {\Configure{mathop}{*} + {<\a:mathml mrow \mml:class="qopname">} + {</\a:mathml mrow><mo> &\#x2061;<!--FUNCTION APPLICATION--> </mo>} + {}} +>>> @@ -2489,13 +2499,6 @@ this in the texbook.) >>> -\<configure mathml amsopn\><<< -\Configure{qopname} - {\Configure{mathop}{*} - {<\a:mathml mi \mml:class="qopname">} - {</\a:mathml mi><mo> &\#x2061;<!--FUNCTION APPLICATION--> </mo>} - {}} ->>> The following CSS caused too large whitespace around functions %\Css{mi.qopname + mo{margin-left:0.3em}} @@ -3477,8 +3480,8 @@ but not \verb=$\mathop{div} (\mathbf{F})$= \expandafter\HLet\csname #1\endcsname\:tempc } \:tempb{lim} -\:tempb{limsup} -\:tempb{liminf} +% \:tempb{limsup} +% \:tempb{liminf} \:tempb{max} \:tempb{min} \:tempb{sup} @@ -3486,6 +3489,18 @@ but not \verb=$\mathop{div} (\mathbf{F})$= \:tempb{det} \:tempb{Pr} \:tempb{gcd} + + +>>> + +We need a special configuration for these two word operators, in order to get a good spacing. + +\<configure mathml latex\><<< +\def\:limspaces#1#2{\HCode{<\a:mathml mi>#1</\a:mathml mi><\a:mathml mspace class="thinspace" width="0.17em"></\a:mathml mspace><\a:mathml mi>#2</\a:mathml mi><\a:mathml mspace class="thinspace" width="0.17em"></\a:mathml mspace>}} +\def\:tempa{\mathop{\:limspaces{lim}{sup}}\limits} +\HLet\limsup\:tempa +\def\:tempa{\mathop{\:limspaces{lim}{inf}}\limits} +\HLet\liminf\:tempa >>> %%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index d44e3957497..621c2e433b5 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 (2023-08-13-13:20), generated from tex4ht-mathml.tex +% mathml.4ht (2023-09-04-12:56), generated from tex4ht-mathml.tex % Copyright 2009-2023 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 2023-08-13-13:20} +\immediate\write-1{version 2023-09-04-12:56} \exit:ifnot{Preamble,% accents,% @@ -1359,8 +1359,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \expandafter\HLet\csname #1\endcsname\:tempc } \:tempb{lim} -\:tempb{limsup} -\:tempb{liminf} +% \:tempb{limsup} +% \:tempb{liminf} \:tempb{max} \:tempb{min} \:tempb{sup} @@ -1368,6 +1368,13 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \:tempb{det} \:tempb{Pr} \:tempb{gcd} + + +\def\:limspaces#1#2{\HCode{<\a:mathml mi>#1</\a:mathml mi><\a:mathml mspace class="thinspace" width="0.17em"></\a:mathml mspace><\a:mathml mi>#2</\a:mathml mi><\a:mathml mspace class="thinspace" width="0.17em"></\a:mathml mspace>}} +\def\:tempa{\mathop{\:limspaces{lim}{sup}}\limits} +\HLet\limsup\:tempa +\def\:tempa{\mathop{\:limspaces{lim}{inf}}\limits} +\HLet\liminf\:tempa \def\:temp#1#2{\def#1{\PauseMathClass{\HCode{<mi mathvariant="normal">}\ht:special{t4ht@+\string&{35}x#2{59}}\a:HChar\HCode{</mi>}}\EndPauseMathClass}} \:temp\Psi{03A8} \:temp\Delta{0394} @@ -3241,18 +3248,18 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {</\a:mathml mtext></\a:mathml mrow>}}} \HLet\textdef@\:tempc -\def\:tempc{\qopname\relax m{lim inf}} +\def\:tempc{\qopname\relax m{\:limspaces{lim}{inf}}} \HLet\liminf=\:tempc -\def\:tempc{\qopname\relax m{lim sup}} +\def\:tempc{\qopname\relax m{\:limspaces{lim}{sup}}} \HLet\limsup=\:tempc -\def\:tempc{\qopname\relax m{proj lim}} +\def\:tempc{\qopname\relax m{\:limspaces{proj}{lim}}} \HLet\projlim=\:tempc -\def\:tempc{\qopname\relax m{inj lim}} +\def\:tempc{\qopname\relax m{\:limspaces{inj}{lim}}} \HLet\injlim=\:tempc \Configure{qopname} {\Configure{mathop}{*} - {<\a:mathml mi \mml:class="qopname">} - {</\a:mathml mi><mo> &\#x2061;<!--FUNCTION APPLICATION--> </mo>} + {<\a:mathml mrow \mml:class="qopname">} + {</\a:mathml mrow><mo> &\#x2061;<!--FUNCTION APPLICATION--> </mo>} {}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht b/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht index 3378a879008..39f6f0ef190 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mkht-scripts.4ht @@ -1,4 +1,4 @@ -% mkht-scripts.4ht (2020-11-23-10:05), generated from tex4ht-mkht.tex +% mkht-scripts.4ht (2023-08-27-00:00), generated from tex4ht-mkht.tex % Copyright 2009-2020 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % @@ -18,7 +18,7 @@ % If you modify this program, changing the % version identification would be appreciated. % -\immediate\write-1{version \ifx \JOBNAME\UnDefined 2020-11-23-10:05\else |version\fi} +\immediate\write-1{version \ifx \JOBNAME\UnDefined 2023-08-27-00:00\else |version\fi} \ifx \JOBNAME\UnDef @@ -40,7 +40,6 @@ \Quote{'} \Argchar{$} \Dirchar{-f/} -\Rubycall{} \Echooff{} \Remark{#} @@ -148,7 +147,6 @@ \Quote{} \Argchar{%} \Dirchar{} -\Rubycall{call } \Echooff{@echo off} \Remark{Rem } |