From 1afb0ac8778496b5572ff052f832d3931dddcea3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 5 Oct 2023 21:15:13 +0000 Subject: eliminate \mathchoice from some configurations, tex4ht r1377 git-svn-id: svn://tug.org/texlive/trunk@68458 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 6 ++++++ Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex | 10 +++++----- Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 12 ++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 41ec5d2ce8b..e56e2545c34 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2023-10-04 Michal Hoftich + + * tex4ht-mathml.tex (mathml.4ht): removed \mathchoice from + configurations of \dfrac, \tfrac, \tbinom and \dbinom. It caused + output of verbatim TeX code in the ODT output. + 2023-10-04 Michal Hoftich * tex4ht-sty.tex (tex4ht.sty): disable the \DocumentMetadata diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index 0569dde4347..fe8614f5edf 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 1374 2023-09-25 14:17:53Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1377 2023-10-05 10:14:06Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -1603,14 +1603,14 @@ Use correct math style for Amsmath's variants of inline fractions. We also need support their use \Link[https://github.com/michal-h21/make4ht/issues/129]{}{}inside of fractions\EndLink. \<<< -\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}>} +\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="true">} \Configure{over}{}{}}{}{}{\HCode{} } {}{\HCode{}}} -\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="false"}{}{}{}>} +\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="false">} \Configure{over}{}{}}{}{}{\HCode{} }{}{\HCode{}}} -\pend:def\dbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}>}}{}{}{}{}{\HCode{}}} -\pend:def\tbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="false"}{}{}{}>}}{}{}{}{}{\HCode{}}} +\pend:def\dbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="true">}}{}{}{}{}{\HCode{}}} +\pend:def\tbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="false">}}{}{}{}{}{\HCode{}}} >>> \<<< diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index 484a951b298..68cdce1d924 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-09-26-13:26), generated from tex4ht-mathml.tex +% mathml.4ht (2023-10-05-13:12), 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-09-26-13:26} +\immediate\write-1{version 2023-10-05-13:12} \exit:ifnot{Preamble,% accents,% @@ -2093,14 +2093,14 @@ accent="true">&\#x0332;}% mrow>} \fi } -\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}>} +\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="true">} \Configure{over}{}{}}{}{}{\HCode{} } {}{\HCode{}}} -\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="false"}{}{}{}>} +\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="false">} \Configure{over}{}{}}{}{}{\HCode{} }{}{\HCode{}}} -\pend:def\dbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}>}}{}{}{}{}{\HCode{}}} -\pend:def\tbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="false"}{}{}{}>}}{}{}{}{}{\HCode{}}} +\pend:def\dbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="true">}}{}{}{}{}{\HCode{}}} +\pend:def\tbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="false">}}{}{}{}{}{\HCode{}}} \def\:tempc{\ifDisplayMath\mathop:prefix{}\fi\o:n:iint::} \HLet\n:iint:\:tempc \def\:tempc{\ifDisplayMath\mathop:prefix{}\fi\o:n:iiint::} -- cgit v1.2.3