diff options
author | Norbert Preining <norbert@preining.info> | 2023-10-06 03:01:32 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-10-06 03:01:32 +0000 |
commit | eb5f6f6b85d43592051aaf5c6e14e4173cffeba9 (patch) | |
tree | 3ad2247ded22493e2facfbae25b88d20c4144292 /support | |
parent | de10325d1f4ef1ac2c14d6e3711771caf4a4f3ae (diff) |
CTAN sync 202310060301
Diffstat (limited to 'support')
-rw-r--r-- | support/TeX4ht/source/ChangeLog | 6 | ||||
-rw-r--r-- | support/TeX4ht/source/tex4ht-mathml.tex | 10 | ||||
-rw-r--r-- | support/pdfjam/VERSION | 2 | ||||
-rwxr-xr-x | support/pdfjam/bin/pdfjam | 6 | ||||
-rw-r--r-- | support/pdfjam/pdfjam.conf | 2 |
5 files changed, 16 insertions, 10 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index 41ec5d2ce8..e56e2545c3 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/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/support/TeX4ht/source/tex4ht-mathml.tex b/support/TeX4ht/source/tex4ht-mathml.tex index 0569dde434..fe8614f5ed 100644 --- a/support/TeX4ht/source/tex4ht-mathml.tex +++ b/support/TeX4ht/source/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/support/pdfjam/VERSION b/support/pdfjam/VERSION index 824e1853a4..093797fc7e 100644 --- a/support/pdfjam/VERSION +++ b/support/pdfjam/VERSION @@ -1 +1 @@ -This is pdfjam 3.08
\ No newline at end of file +This is pdfjam 3.09 diff --git a/support/pdfjam/bin/pdfjam b/support/pdfjam/bin/pdfjam index cd6ea75cbe..04099e3917 100755 --- a/support/pdfjam/bin/pdfjam +++ b/support/pdfjam/bin/pdfjam @@ -1,5 +1,5 @@ #!/bin/sh -version=3.08 +version=3.09 ######################################################################### ## ## ## pdfjam: A shell-script interface to the "pdfpages" LaTeX package ## @@ -1151,7 +1151,7 @@ select_pdfinfo () { } echo_hex_iconv_utf16be () { printf '%s' "$1" | \ - "$iconv" -f utf8 -t utf16be | \ + "$iconv" -f UTF-8 -t UTF-16BE | \ od -An -v -tx1 | \ tr -d '[:space:]' } @@ -1172,7 +1172,7 @@ if test "$keepinfo" = true ; then fi echo_iconv_from_enc () { printf '%s' "$2" | \ - "$iconv" -f "$1" -t utf8 + "$iconv" -f "$1" -t UTF-8 } if test -n "$pdfTitle" ; then pdftitl=$(echo_iconv_from_enc "$enc" "$pdfTitle") diff --git a/support/pdfjam/pdfjam.conf b/support/pdfjam/pdfjam.conf index b33ac97582..c1a14a1266 100644 --- a/support/pdfjam/pdfjam.conf +++ b/support/pdfjam/pdfjam.conf @@ -100,7 +100,7 @@ twoside='false' ## overridden by '--twoside' in the call ## preamble='' ## concatenate other strings to this by using '--preamble' ## -# enc='utf8' ## overridden by '--enc ENC' in the call +# enc='UTF-8' ## overridden by '--enc ENC' in the call # ## ENC must be one of iconv encodings ## ############################################################### |