missed commits

git-svn-id: svn://tug.org/texlive/trunk@63862 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 40 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
index 4991b7df5a2..cb77c13bfe5 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html-mml.4ht
@@ -1,4 +1,4 @@
-% html-mml.4ht (2021-04-17-18:22), generated from tex4ht-mathml.tex
+% html-mml.4ht (2022-07-05-14:37), generated from tex4ht-mathml.tex
 % Copyright 2009-2021 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 2021-04-17-18:22}
+\immediate\write-1{version 2022-07-05-14:37}
 
 \exit:ifnot{amsmath,% 
 array,% 
@@ -65,8 +65,8 @@ tex4ht}
 \fi
 \Configure{DviMath}
     {\a:DviMathML \mathmltrue
-       \ifOption{mml-fonts}{\Configure{htf}{0}{+}{<mstyle\Hnewline
-   class="}{\%s}{-\%s}{x-x-\%d}{}{">}{</mstyle>}%
+       \ifOption{mml-fonts}{\Configure{htf}{0}{+}{<\a:mathml mstyle\Hnewline
+   class="}{\%s}{-\%s}{x-x-\%d}{}{">}{</\a:mathml mstyle>}%
 }{\NoFonts}%
        \IgnoreRule \HCode{<!--l.
        \the\inputlineno-->}\Tg<\a:mathml math\Hnewline
@@ -480,9 +480,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsmath}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -678,6 +675,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{plain}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -733,6 +733,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{array}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -822,6 +823,13 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
+
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{color}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -830,14 +838,14 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
     \Configure{color}%
       {\Configure{SetHColor}
            {\Css{.textcolor\textcolorN{color:\HColor}}}}%
-    \HCode{<\ifmathml mstyle\else span\fi
+    \HCode{<\ifmathml\a:mathml mstyle\else span\fi
            \space id="textcolor\textcolorN">}}%
-   {\HCode{</\ifmathml mstyle\else span\fi>}}
+   {\HCode{</\ifmathml\a:mathml  mstyle\else span\fi>}}
 \Configure{textcolor}
    {\ifmathml
        \Configure{color}%
          {\Configure{SetHColor}
-              {\HCode{<mstyle mathcolor="\HColor">}}}%
+              {\HCode{<\a:mathml mstyle mathcolor="\HColor">}}}%
     \else
        \gHAdvance\textcolorN by 1
        \Configure{color}%
@@ -846,7 +854,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
        \HCode{<span id="textcolor\textcolorN">}%
     \fi
    }%
-   {\HCode{</\ifmathml mstyle\else span\fi>}}
+   {\HCode{</\ifmathml\a:mathml  mstyle\else span\fi>}}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -903,9 +911,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{rlbabel}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -953,6 +958,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{frenchb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1270,5 +1276,20 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
index e11d41562f9..a9d8b524c5a 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht
@@ -1,4 +1,4 @@
-% latex.4ht (2022-06-21-13:58), generated from tex4ht-4ht.tex
+% latex.4ht (2022-07-07-14:08), generated from tex4ht-4ht.tex
 % Copyright 1997-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-06-21-13:58}
+\immediate\write-1{version 2022-07-07-14:08}
 
 \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi
 
@@ -2294,15 +2294,7 @@ $\vcenter
 \InitHBorder
 
 \:CheckOption{new-accents}     \if:Option \else
-   \let\:tabacckludge\@tabacckludge
-\def\@tabacckludge#1{\csname #1\endcsname}
-\long\def\:temp#1{\bgroup  \let\@tabacckludge\:tabacckludge
-   \csname o:MakeUppercase :\endcsname{#1}\egroup}
-\expandafter\HLet\csname MakeUppercase \endcsname\:temp
-\long\def\:temp#1{\bgroup  \let\@tabacckludge\:tabacckludge
-   \csname o:MakeLowercase :\endcsname{#1}\egroup}
-\expandafter\HLet\csname MakeLowercase \endcsname\:temp
-\let\@acci\' \let\@accii\` \let\@acciii\=
+   \let\@acci\' \let\@accii\` \let\@acciii\=
 \def\:tempc#1{%
    \if '#1\let\:temp=\@acci   \else
    \if `#1\let\:temp=\@accii  \else
@@ -2322,7 +2314,7 @@ $\vcenter
 \expandafter\:temp\usepackage!*?: 
 \def\:tempa{\@latex@e@error}
 \ifx \:temp\:tempa
-   % latex209.4ht (2022-06-21-13:58), generated from tex4ht-4ht.tex
+   % latex209.4ht (2022-07-07-14:08), generated from tex4ht-4ht.tex
 % Copyright 1997-2009 Eitan M. Gurari
 % Copyright 2009-2022 TeX Users Group
 %
@@ -2341,7 +2333,7 @@ $\vcenter
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2022-06-21-13:58}
+\immediate\write-1{version 2022-07-07-14:08}
 
 \let\:fnsymbol\@fnsymbol
 \def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}}