summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-05 21:15:13 +0000
committerKarl Berry <karl@freefriends.org>2023-10-05 21:15:13 +0000
commit1afb0ac8778496b5572ff052f832d3931dddcea3 (patch)
tree9b4c78d94be772ae181d5497ac256258f7b64b34 /Master/texmf-dist
parentf4d0a9cfba30f6982febe7dd08be23573b0e1c55 (diff)
eliminate \mathchoice from some configurations, tex4ht r1377
git-svn-id: svn://tug.org/texlive/trunk@68458 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex10
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mathml.4ht12
3 files changed, 17 insertions, 11 deletions
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,5 +1,11 @@
2023-10-04 Michal Hoftich <michal.h21@gmail.com>
+ * 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 <michal.h21@gmail.com>
+
* tex4ht-sty.tex (tex4ht.sty): disable the \DocumentMetadata
command, in order to prevent invocation of the LaTeX tagging system,
which clashes with TeX4ht.
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.
\<configure mathml amsmath\><<<
-\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \mathchoice{\a:mathml displaystyle="true"}{}{}{}><mfrac><mrow>}
+\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \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>}
+\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \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>}}}
+\pend:def\dbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="true">}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}}
+\pend:def\tbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="false">}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}}
>>>
\<mathml latex\><<<
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;</\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"}{}{}{}><mfrac><mrow>}
+\pend:def\dfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \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>}
+\pend:def\tfrac{\Configure{genfrac}{\HCode{<\a:mathml mstyle \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>}}}
+\pend:def\dbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="true">}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}}
+\pend:def\tbinom{\Configure{genfrac}{\HCode{<\a:mathml mstyle \a:mathml displaystyle="false">}}{}{}{}{}{\HCode{</\a:mathml mstyle>}}}
\def\:tempc{\ifDisplayMath\mathop:prefix{}\fi\o:n:iint::}
\HLet\n:iint:\:tempc
\def\:tempc{\ifDisplayMath\mathop:prefix{}\fi\o:n:iiint::}