From da497e0d95c4bfe1009c9d4e28870429152114d2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 4 Oct 2022 20:23:40 +0000 Subject: remove spurious svg elements from beamer, tex4ht r1207; displaystyle attribute, tex4ht r1208 git-svn-id: svn://tug.org/texlive/trunk@64621 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 10 ++++++++ .../source/generic/tex4ht/tex4ht-4ht.tex | 8 +++++- .../source/generic/tex4ht/tex4ht-mathml.tex | 7 ++--- Master/texmf-dist/tex/generic/tex4ht/beamer.4ht | 5 ++-- Master/texmf-dist/tex/generic/tex4ht/mathml.4ht | 30 ++++++++++++---------- .../texmf-dist/tex/generic/tex4ht/usepackage.4ht | 4 +-- 6 files changed, 43 insertions(+), 21 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 8687d548f20..e24fd6afd15 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,13 @@ +2022-10-04 Michal Hoftich + + * tex4ht-mathml.tex (mathml.4ht): use displaystyle attribute in + equation like environments to get correct size of fractions and + other elements. + https://tex.stackexchange.com/a/660509/2891 + + * tex4ht-4ht.tex (beamer.4ht): removed nonsensical SVG elements from + the columns environment. + 2022-10-03 Michal Hoftich * tex4ht-4ht.tex (beamer.4ht): disable frame breaks. diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 1f187bbd091..2490518aab8 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 1206 2022-10-03 12:58:33Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1207 2022-10-04 14:17:12Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -25982,6 +25982,12 @@ It should still work in the picture mode, as we use the HLet command. \<<< \HLet\framebreak\relax +>>> + +This should prevent insertion of SVG elements around columns: + +\<<< +\HLet\beamer@@spacingcover\relax >>> Beamer can break BibLaTeX's bibliography across several slides, diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mathml.tex index b2e07b052e6..0773227cd9f 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 1183 2022-08-17 10:03:42Z michal_h21 $$ +% $Id: tex4ht-mathml.tex 1208 2022-10-04 15:40:58Z michal_h21 $$ % compile 3 times: latex tex4ht-mathltx % or xhlatex tex4ht-mathltx "html,3,sections+" % @@ -2115,7 +2115,7 @@ POP \DisplayMathtrue \fi \HCode{<\a:mathml mtable\Hnewline - \a:mathml columnalign="left" \mml:class="#2">}} + \a:mathml displaystyle="true" \a:mathml columnalign="left" \mml:class="#2">}} {\HCode{}\end:mathalign } {\HCode{<\a:mathml mtr>}} {\HCode{}} {\HCode{<\a:mathml mtd\Hnewline @@ -2630,7 +2630,8 @@ in page 252-- in intro to theory book. {\ifvmode \IgnorePar \fi \EndP \ShowPar \par} {}{} \Configure{eqnarray} - {\HCode{<\a:mathml mtable\Hnewline \mml:class="eqnarray\ifx + {\HCode{<\a:mathml mtable\Hnewline \a:mathml displaystyle="true" + \mml:class="eqnarray\ifx \@seqncr\@eqncr\else-star\fi" \a:mathml columnalign="right center left" >}}% {\HCode{}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht b/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht index 021d361d041..e7ed45d077b 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/beamer.4ht @@ -1,4 +1,4 @@ -% beamer.4ht (2022-10-03-14:39), generated from tex4ht-4ht.tex +% beamer.4ht (2022-10-04-13:07), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-10-03-14:39} +\immediate\write-1{version 2022-10-04-13:07} \NewConfigure{titlepage}{2} \NewConfigure{title}{2} @@ -166,6 +166,7 @@ \append:defI\emph{\b:emph}% \HLet\framebreak\relax +\HLet\beamer@@spacingcover\relax \NewConfigure{beamerbiblatex}{3} \@ifpackageloaded{biblatex}{ \pend:defI\beamer@biblabeltemplate{% diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht index 0089ab14797..b3889b3b68f 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 (2022-08-17-14:11), generated from tex4ht-mathml.tex +% mathml.4ht (2022-10-04-13:07), generated from tex4ht-mathml.tex % Copyright 2009-2022 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 2022-08-17-14:11} +\immediate\write-1{version 2022-10-04-13:07} \exit:ifnot{Preamble,% accents,% @@ -721,7 +721,8 @@ vanilla} {\ifvmode \IgnorePar \fi \EndP \ShowPar \par} {}{} \Configure{eqnarray} - {\HCode{<\a:mathml mtable\Hnewline \mml:class="eqnarray\ifx + {\HCode{<\a:mathml mtable\Hnewline \a:mathml displaystyle="true" + \mml:class="eqnarray\ifx \@seqncr\@eqncr\else-star\fi" \a:mathml columnalign="right center left" >}}% {\HCode{}} @@ -1733,6 +1734,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsbsy} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1878,7 +1880,7 @@ accent="true">&\#x0332;}% \DisplayMathtrue \fi \HCode{<\a:mathml mtable\Hnewline - \a:mathml columnalign="left" \mml:class="#2">}} + \a:mathml displaystyle="true" \a:mathml columnalign="left" \mml:class="#2">}} {\HCode{}\end:mathalign } {\HCode{<\a:mathml mtr>}} {\HCode{}} {\HCode{<\a:mathml mtd\Hnewline @@ -2101,7 +2103,6 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsfonts} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2123,6 +2124,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex1} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2186,7 +2188,6 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -2354,6 +2355,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3252,7 +3254,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3330,7 +3331,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3386,6 +3386,8 @@ accent="true">&\#x0332;}% + + @@ -3425,8 +3427,6 @@ accent="true">&\#x0332;}% - - @@ -3658,6 +3658,7 @@ accent="true">&\#x0332;}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{gauss} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3718,6 +3719,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{rlbabel} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3755,6 +3757,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3825,6 +3828,7 @@ accent="true">&\#x0332;}% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3964,7 +3968,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -3990,7 +3993,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{subeqnarray} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4136,7 +4138,6 @@ accent="true">&\#x0332;}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -4299,6 +4300,9 @@ accent="true">&\#x0332;}% + + + diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index 953bfcf2cf0..6a6b9c1ed68 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2022-10-03-14:39), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-10-04-13:07), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-10-03-14:39} +\immediate\write-1{version 2022-10-04-13:07} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} -- cgit v1.2.3