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/tex | |
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/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/docbook.4ht | 81 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 41 |
3 files changed, 98 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht b/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht index f6c103de771..4b72ebb2a39 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/amsmath.4ht @@ -1,6 +1,6 @@ -% amsmath.4ht (2019-12-29-14:17), generated from tex4ht-4ht.tex +% amsmath.4ht (2023-08-13-13:20), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari -% Copyright 2009-2019 TeX Users Group +% Copyright 2009-2023 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2019-12-29-14:17} +\immediate\write-1{version 2023-08-13-13:20} \HRestore\cases \HRestore\matrix @@ -495,14 +495,6 @@ \def\:tempc{% \crcr\EndMkHalign \b:split \egroup } \HLet\endsplit\:tempc -\Configure{@begin} - {split} - {\relax - \ifx \split\insplit@ \else - \def\choose:begin{\global\let\choose:begin\@firstoftwo - \@secondoftwo}% - \fi - } \NewConfigure{equations}[2]{\def\pic:equa{#1}\def\pic:equb{#2}} \def\str:pic{\ifx \EndPicture\:UnDef \expandafter\Picture\pic:equa{ \pic:equb}% diff --git a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht index c754c12f94e..8bb0847889f 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht @@ -1,4 +1,4 @@ -% docbook.4ht (2021-04-16-13:27), generated from tex4ht-docbook.tex +% docbook.4ht (2023-08-13-13:20), generated from tex4ht-docbook.tex % Copyright 2009-2021 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-04-16-13:27} +\immediate\write-1{version 2023-08-13-13:20} \exit:ifnot{Preamble,% algorithmic,% @@ -56,7 +56,8 @@ scrreprt,% splitidx,% subeqnarray,% tex4ht,% -texinfo} +texinfo,% +ulem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{Preamble} @@ -1704,7 +1705,6 @@ version="5.0" \Hnewline - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2550,7 +2550,6 @@ version="5.0" \Hnewline %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsmath} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2800,6 +2799,8 @@ version="5.0" \Hnewline + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{array} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2930,6 +2931,13 @@ version="5.0" \Hnewline + + + + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{fancyvrb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2950,6 +2958,8 @@ version="5.0" \Hnewline + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{color} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3505,8 +3515,6 @@ version="5.0" \Hnewline - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{dcolumn} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3522,6 +3530,10 @@ version="5.0" \Hnewline + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{multirow} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3542,6 +3554,12 @@ version="5.0" \Hnewline + + + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{makeidx} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3662,8 +3680,6 @@ version="5.0" \Hnewline - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{texinfo} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3919,6 +3935,7 @@ version="5.0" \Hnewline + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{scrbook} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4603,6 +4620,7 @@ version="5.0" \Hnewline \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{scrreprt} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4943,6 +4961,9 @@ version="5.0" \Hnewline + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{llncs} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5001,6 +5022,7 @@ version="5.0" \Hnewline + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{prosper} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5019,6 +5041,7 @@ version="5.0" \Hnewline %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{beamer} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5273,6 +5296,8 @@ version="5.0" \Hnewline + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{pgf} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5312,6 +5337,7 @@ version="5.0" \Hnewline + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{subeqnarray} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5344,6 +5370,7 @@ version="5.0" \Hnewline + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{algorithmic} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -5391,6 +5418,23 @@ version="5.0" \Hnewline +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \ConfigureHinput{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>}} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput\empty\empty\empty\empty\empty\empty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + @@ -5532,5 +5576,24 @@ version="5.0" \Hnewline + + + + + + + + + + + + + + + + + + + \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index be52a1b91b6..d44e3957497 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-07-11-13:50), generated from tex4ht-mathml.tex +% mathml.4ht (2023-08-13-13:20), 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-07-11-13:50} +\immediate\write-1{version 2023-08-13-13:20} \exit:ifnot{Preamble,% accents,% @@ -875,9 +875,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {\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}} @@ -1745,7 +1745,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsbsy} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2079,8 +2078,12 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% mrow></\a:mathml mfrac></\a:mathml mfenced>} \fi } -\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>}}} \def\:tempc{\ifDisplayMath\mathop:prefix{}\fi\o:n:iint::} @@ -2376,8 +2379,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2731,9 +2732,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% {\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}} @@ -3282,6 +3283,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{array} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3359,6 +3362,11 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + + + + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amscd} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3416,6 +3424,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{vanilla} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3456,7 +3465,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amssymb} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3745,8 +3753,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{rlbabel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3783,8 +3789,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{dcolumn} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4029,6 +4033,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{subeqnarray} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4093,7 +4098,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ushort} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4131,6 +4135,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{bm} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4179,7 +4184,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{ulem} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4353,5 +4357,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}% + \endinput |