diff options
author | Karl Berry <karl@freefriends.org> | 2023-08-13 20:31:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-08-13 20:31:40 +0000 |
commit | 89f9de8e1cc260a242bb129e42c478656554b825 (patch) | |
tree | f64f02d1cead57493aa3403dabfe12f4cce39205 /Master/texmf-dist/source/generic | |
parent | 1fd23bc2f032f51fdcdef3f534d7f3a32e0edd17 (diff) |
fix mathml \dfrac inside \frac, tex4ht r1356; wrong markup for primes, tex4ht r1355; ulem formatting for docbook, tex4ht r1354; fix split environment fatal error, tex4ht r1353
git-svn-id: svn://tug.org/texlive/trunk@67920 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
4 files changed, 52 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index ca3df845bdd..9790ff09226 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,20 @@ +2023-08-13 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-mathml.tex (mathml.4ht): fixed handling of \tfrac and + \dfrac inside of \frac. + https://github.com/michal-h21/make4ht/issues/129 + + * tex4ht-mathml.tex (mathml.4ht): fixed wrong markup for primes. + https://github.com/michal-h21/make4ht/issues/130 + + * tex4ht-docbook.tex (docbook.4ht): added formatting for the Ulem + package configurations. + https://github.com/michal-h21/make4ht/issues/131 + + * tex4ht-4ht.tex (amsmath.4ht): don't redefine environment handling + macros in the split environment. + https://github.com/michal-h21/make4ht/issues/132 + 2023-07-28 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (xskak.4ht): removed redefiniton of \mainline and diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index a3f229f1f50..2b7fe067364 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 1352 2023-07-28 18:30:37Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1353 2023-08-13 17:48:56Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2023 TeX Users Group @@ -21565,7 +21565,14 @@ The split environment looks like The folowing tries to compensate for the above extra openning split environment. -\<equations of amsmath.sty\><<< +But in 2023, this causes fatal error in the compilation. Furthermore, +the test cases that follows work in the picture and MathML modes, +so it seems that it isn't necessary anymore. + +Bug report for the fatal error can be +\Link[https://github.com/michal-h21/make4ht/issues/132]{}{}found here\EndLink + +\<do not use in equations of amsmath.sty\><<< \Configure{@begin} {split} {\relax diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex index 86fcca695db..3c9888f2db8 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-docbook.tex 904 2021-04-16 20:30:30Z karl $ +% $Id: tex4ht-docbook.tex 1354 2023-08-13 17:55:27Z michal_h21 $ % compile 3 times: latex tex4ht-docbook % or xhlatex tex4ht-docbook "html,3,sections+" % @@ -2692,6 +2692,20 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \verb'̲' is the code of \verb'_' +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Ulem} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +\<configure docbook ulem\><<< +\Configure{uline}{\HCode{<emphasis role="underline">}}{\HCode{</emphasis>}} +\Configure{uuline}{\HCode{<emphasis role="underline">}}{\HCode{</emphasis>}} +\Configure{sout}{\HCode{<emphasis role="underline">}}{\HCode{</emphasis>}} +\Configure{xout}{\HCode{<emphasis role="underline">}}{\HCode{</emphasis>}} +\Configure{uwave}{\HCode{<emphasis role="underline">}}{\HCode{</emphasis>}} +\Configure{dashuline}{\HCode{<emphasis role="underline">}}{\HCode{</emphasis>}} +\Configure{dotuline}{\HCode{<emphasis role="underline">}}{\HCode{</emphasis>}} +>>> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \chapter{AMS} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index eb549a14294..1af96d34dbe 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 1347 2023-07-11 20:48:44Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1356 2023-08-13 18:48:02Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -1599,11 +1599,16 @@ configurations, respectively. } >>> -Use correct math style for Amsmath's variants of inline fractions. +Use correct math style for Amsmath's variants of inline fractions. We also need to add fractions markup in tfrac and dfrac to +support their use \Link[https://github.com/michal-h21/make4ht/issues/129]{}{}inside of fractions\EndLink. \<configure mathml amsmath\><<< -\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}>}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}} -\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="false"}{}{}{}>}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}} +\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}><mfrac><mrow>} + \Configure{over}{}{}}{}{}{\HCode{</mrow><mrow>} +} {}{\HCode{</mrow></mfrac></\a:mathml mstyle>}}} +\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="false"}{}{}{}><mfrac><mrow>} + \Configure{over}{}{}}{}{}{\HCode{</mrow><mrow>} +}{}{\HCode{</mrow></mfrac></\a:mathml mstyle>}}} \pend:def\dbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}>}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}} \pend:def\tbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="false"}{}{}{}>}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}} >>> @@ -1847,9 +1852,9 @@ Used to be {\relax \csname SUB:prime\endcsname\sp{% \global\let\SUB:prime=\:UnDef \def\:tempa{\prime\prime}\ifx \:tempa\:primes - \mathop{\HCode{\string&\#x2033;}}\else + \mathop{\HCode{<\a:mathml mi>\string&\#x2033;</\a:mathml mi>}}\else \def\:tempa{\prime\prime\prime}\ifx \:tempa\:primes - \mathop{\HCode{\string&\#x2034;}}\else + \mathop{\HCode{<\a:mathml mi>\string&\#x2034;</\a:mathml mi>}}\else \:primes \fi\fi}% } {\let\prime=\relax \xdef\:primes{\:primes\prime}} |