<mstyle>, mathml fn encoding, tex4ht r627-628

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

1 files changed, 34 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index cbfd22ba7cf..3e5a887b72b 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
@@ -1,5 +1,5 @@
-% mathml.4ht (2019-08-26-14:22), generated from tex4ht-mathml.tex
-% Copyright 2009-2018 TeX Users Group
+% mathml.4ht (2019-11-26-14:23), generated from tex4ht-mathml.tex
+% Copyright 2009-2019 TeX Users Group
 % Copyright 1999-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2019-08-26-14:22}
+\immediate\write-1{version 2019-11-26-14:23}
 
 \exit:ifnot{Preamble,% 
 accents,% 
@@ -1587,8 +1587,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
    {\let\o:underbrace:=\displaystyle}
    {}
 \Configure{MathClass}{0}{*}{<\a:mathml mi\Hnewline>}{</\a:mathml mi>}{}
-\Configure{MathClass}{1}{*}{<\a:mathml mo\Hnewline
-             \mml:class="MathClass-op">}{</\a:mathml mo>}{}
+\Configure{MathClass}{1}{*}{<\a:mathml mi\Hnewline
+             \mml:class="MathClass-op">}{</\a:mathml mi><mo> &ApplyFunction;<!--FUNCTION APPLICATION--></mo>}{}
 \Configure{MathClass}{2}{*}{<\a:mathml mo\Hnewline
              \mml:class="MathClass-bin">}{</\a:mathml mo>}{}
 \Configure{MathClass}{3}{*}{<\a:mathml mo\Hnewline
@@ -1632,33 +1632,33 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 \def\bold:version{bold}
 \Configure{mathbf}%
-  {\bgroup \Tg<\a:mathml mi
-             mathvariant="bold">\PauseMathClass}%
-  {\EndPauseMathClass\Tg</\a:mathml mi>\egroup }%
+  {\Tg<\a:mathml mstyle
+             mathvariant="bold">}%
+  {\Tg</\a:mathml mstyle>}%
 \Configure{mathit}%
-  {\bgroup \Tg<\a:mathml mi  mathvariant="\ifx
-                 \bold:version\math@version bold-\fi italic">\PauseMathClass}%
-  {\EndPauseMathClass\Tg</\a:mathml mi>\egroup }%
+  {\Tg<\a:mathml mstyle  mathvariant="\ifx
+                 \bold:version\math@version bold-\fi italic">}%
+  {\Tg</\a:mathml mstyle>}%
 \Configure{mathrm}%
-  {\bgroup \Tg<\a:mathml mi
+  {\Tg<\a:mathml mstyle
              mathvariant="\ifx
-                 \bold:version\math@version bold\else normal\fi">\PauseMathClass}%
-  {\EndPauseMathClass\Tg</\a:mathml mi>\egroup }%
+                 \bold:version\math@version bold\else normal\fi">}%
+  {\Tg</\a:mathml mstyle>}%
 \Configure{mathsf}%
-  {\bgroup \Tg<\a:mathml mi  mathvariant="\ifx
-            \bold:version\math@version bold-\fi sans-serif">\PauseMathClass}%
-  {\EndPauseMathClass\Tg</\a:mathml mi>\egroup }%
+  {\Tg<\a:mathml mstyle  mathvariant="\ifx
+            \bold:version\math@version bold-\fi sans-serif">}%
+  {\Tg</\a:mathml mstyle>}%
 \Configure{mathtt}%
-  {\bgroup \Tg<\a:mathml mi mathvariant="monospace">\PauseMathClass}%
-  {\EndPauseMathClass\Tg</\a:mathml mi>\egroup }%
+  {\Tg<\a:mathml mstyle mathvariant="monospace">}%
+  {\Tg</\a:mathml mstyle>}%
 \Css{
-   math mi[mathvariant="bold"]  {
+   math mstyle[mathvariant="bold"]  {
       font-weight: bold;
       font-style: normal;
    }
 }
 \Css{
-   math mi[mathvariant="normal"]  {
+   math mstyle[mathvariant="normal"]  {
       font-weight: normal;
       font-style: normal;
    }
@@ -1717,7 +1717,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsbsy}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2592,8 +2591,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
    {\let\o:underbrace:=\displaystyle}
    {}
 \Configure{MathClass}{0}{*}{<\a:mathml mi\Hnewline>}{</\a:mathml mi>}{}
-\Configure{MathClass}{1}{*}{<\a:mathml mo\Hnewline
-             \mml:class="MathClass-op">}{</\a:mathml mo>}{}
+\Configure{MathClass}{1}{*}{<\a:mathml mi\Hnewline
+             \mml:class="MathClass-op">}{</\a:mathml mi><mo> &ApplyFunction;<!--FUNCTION APPLICATION--></mo>}{}
 \Configure{MathClass}{2}{*}{<\a:mathml mo\Hnewline
              \mml:class="MathClass-bin">}{</\a:mathml mo>}{}
 \Configure{MathClass}{3}{*}{<\a:mathml mo\Hnewline
@@ -3203,11 +3202,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 \HLet\injlim=\:tempc
 \Configure{qopname}
    {\Configure{mathop}{*}
-      {<\a:mathml mo \mml:class="qopname">}
-      {</\a:mathml mo>}
+      {<\a:mathml mi \mml:class="qopname">}
+  {</\a:mathml mi><mo> &ApplyFunction;<!--FUNCTION APPLICATION--> </mo>}
       {}}
-\Css{mo.qopname + mi{margin-left:0.3em}}
-\Css{mi + mo.qopname{margin-left:0.3em}}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -3234,7 +3231,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{array}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3368,6 +3364,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{vanilla}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3406,6 +3403,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amssymb}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3731,7 +3730,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{dcolumn}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3928,6 +3926,12 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{accents}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3951,7 +3955,6 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{subeqnarray}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4201,6 +4204,5 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
 \endinput