some mathml fixes per http://puszcza.gnu.org.ua/bugs/?340, tex4ht r200

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

1 files changed, 38 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht b/Master/texmf-dist/tex/generic/tex4ht/mathml.4ht
index 9b50d32ebc2..7b56da2a078 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 (2016-08-11-16:11), generated from tex4ht-mathml.tex
+% mathml.4ht (2016-11-23-15:58), generated from tex4ht-mathml.tex
 % Copyright 2009-2015 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 2016-08-11-16:11}
+\immediate\write-1{version 2016-11-23-15:58}
 
 \exit:ifnot{Preamble,% 
 accents,% 
@@ -410,15 +410,15 @@ vanilla}
       \HCode{</\a:mathml mrow>}\o:over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>}
    \else
-      \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline
-          open="\expandafter
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="\expandafter
 \ifx \csname \string#2:lr del\endcsname\relax #2\else
      \csname \string#2:lr del\endcsname\fi
-" close="\expandafter
+" \a:mathml close="\expandafter
 \ifx \csname \string#3:lr del\endcsname\relax #3\else
      \csname \string#3:lr del\endcsname\fi
 "><\a:mathml mfrac
-          linethickness="\the\tmp:dim"><\a:mathml mrow>}%
+          \a:mathml linethickness="\the\tmp:dim"><\a:mathml mrow>}%
       \HCode{</\a:mathml mrow>}\o:over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml
                                 mrow></\a:mathml mfrac></\a:mathml mfenced>}
@@ -434,15 +434,15 @@ vanilla}
       \HCode{</\a:mathml mrow>}\o:atop:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>}
    \else
-      \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline
-          open="\expandafter
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="\expandafter
 \ifx \csname \string#2:lr del\endcsname\relax #2\else
      \csname \string#2:lr del\endcsname\fi
-" close="\expandafter
+" \a:mathml close="\expandafter
 \ifx \csname \string#3:lr del\endcsname\relax #3\else
      \csname \string#3:lr del\endcsname\fi
 "><\a:mathml mfrac
-          linethickness="0"><\a:mathml mrow>}%
+          \a:mathml linethickness="0"><\a:mathml mrow>}%
       \HCode{</\a:mathml mrow>}\o:atop:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml
                               mrow></\a:mathml mfrac></\a:mathml mfenced>}
@@ -457,11 +457,11 @@ vanilla}
       \HCode{</\a:mathml mrow>}\o:over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>}
    \else
-      \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline
-          open="\expandafter
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="\expandafter
 \ifx \csname \string#2:lr del\endcsname\relax #2\else
      \csname \string#2:lr del\endcsname\fi
-" close="\expandafter
+" \a:mathml close="\expandafter
 \ifx \csname \string#3:lr del\endcsname\relax #3\else
      \csname \string#3:lr del\endcsname\fi
 "><\a:mathml mfrac><\a:mathml mrow>}%
@@ -552,6 +552,7 @@ vanilla}
   {$\Tg</\a:mathml mrow>\EndDviMath\csname b:mathml()\endcsname}
 \NewConfigure{mathml[]}{2}
 \NewConfigure{mathml()}{2}
+\let\columnlines\empty
 \Configure{halignTB<>}{array}{\HCode{\Hnewline
    \a:mathml equalrows="false"
    \a:mathml columnlines="\columnlines"
@@ -862,14 +863,14 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 \def\:temp#1{\a:right{#1}\o:right:.\b:right{#1}}\HLet\right\:temp
 \Configure{left}
    {}
-   {\HCode{<\a:mathml mfenced separators=""\Hnewline
-       open="\expandafter
+   {\HCode{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+       \a:mathml open="\expandafter
 \ifx \csname \string#1:lr del\endcsname\relax #1\else
      \csname \string#1:lr del\endcsname\fi
 "\space }\bgroup
                               \HCode{><\a:mathml mrow>}\bgroup}
 \Configure{right}
-   {\egroup\Send{GROUP}{0}{ close="\expandafter
+   {\egroup\Send{GROUP}{0}{ \a:mathml close="\expandafter
 \ifx \csname \string#1:lr del\endcsname\relax #1\else
      \csname \string#1:lr del\endcsname\fi
 "\space}\egroup}
@@ -1751,15 +1752,15 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
       \HCode{</\a:mathml mrow>}\o:over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>}
    \else
-      \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline
-          open="\expandafter
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="\expandafter
 \ifx \csname \string#2:lr del\endcsname\relax #2\else
      \csname \string#2:lr del\endcsname\fi
-" close="\expandafter
+" \a:mathml close="\expandafter
 \ifx \csname \string#3:lr del\endcsname\relax #3\else
      \csname \string#3:lr del\endcsname\fi
 "><\a:mathml mfrac
-          linethickness="0"><\a:mathml mrow>}%
+          \a:mathml linethickness="0"><\a:mathml mrow>}%
       \HCode{</\a:mathml mrow>}\o:@@over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml
                                     mrow></\a:mathml mfrac></\a:mathml mfenced>}
@@ -1968,15 +1969,15 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
       \HCode{</\a:mathml mrow>}\o:@@over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>}
    \else
-      \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline
-          open="\expandafter
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="\expandafter
 \ifx \csname \string#2:lr del\endcsname\relax #2\else
      \csname \string#2:lr del\endcsname\fi
-" close="\expandafter
+" \a:mathml close="\expandafter
 \ifx \csname \string#3:lr del\endcsname\relax #3\else
      \csname \string#3:lr del\endcsname\fi
 "><\a:mathml mfrac
-          linethickness="\the\tmp:dim"><\a:mathml mrow>}%
+          \a:mathml linethickness="\the\tmp:dim"><\a:mathml mrow>}%
       \HCode{</\a:mathml mrow>}\o:@@over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml
                                   mrow></\a:mathml mfrac></\a:mathml mfenced>}
@@ -1988,19 +1989,19 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
    {}
 \def\atopwithdelims:III#1#2#3{%
    \def\:temp{#2#3}\def\:tempa{..}\ifx \:temp\:tempa
-      \Send{GROUP}{0}{<\a:mathml mfrac linethickness="0"><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfrac \a:mathml linethickness="0"><\a:mathml mrow>}%
       \HCode{</\a:mathml mrow>}\o:@@atop:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>}
    \else
-      \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline
-          open="\expandafter
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="\expandafter
 \ifx \csname \string#2:lr del\endcsname\relax #2\else
      \csname \string#2:lr del\endcsname\fi
-" close="\expandafter
+" \a:mathml close="\expandafter
 \ifx \csname \string#3:lr del\endcsname\relax #3\else
      \csname \string#3:lr del\endcsname\fi
 "><\a:mathml mfrac
-          linethickness="0"><\a:mathml mrow>}%
+          \a:mathml linethickness="0"><\a:mathml mrow>}%
       \HCode{</\a:mathml mrow>}\o:@@atop:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml
                                mrow></\a:mathml mfrac></\a:mathml mfenced>}
@@ -2015,11 +2016,11 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
       \HCode{</\a:mathml mrow>}\o:@@over:
       \HCode{<\a:mathml mrow>}\Send{EndGROUP}{0}{</\a:mathml mrow></\a:mathml mfrac>}
    \else
-      \Send{GROUP}{0}{<\a:mathml mfenced separators=""\Hnewline
-          open="\expandafter
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="\expandafter
 \ifx \csname \string#2:lr del\endcsname\relax #2\else
      \csname \string#2:lr del\endcsname\fi
-" close="\expandafter
+" \a:mathml close="\expandafter
 \ifx \csname \string#3:lr del\endcsname\relax #3\else
      \csname \string#3:lr del\endcsname\fi
 "><\a:mathml mfrac><\a:mathml mrow>}%
@@ -2682,14 +2683,14 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 \def\:temp#1{\a:right{#1}\o:right:.\b:right{#1}}\HLet\right\:temp
 \Configure{left}
    {}
-   {\HCode{<\a:mathml mfenced separators=""\Hnewline
-       open="\expandafter
+   {\HCode{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+       \a:mathml open="\expandafter
 \ifx \csname \string#1:lr del\endcsname\relax #1\else
      \csname \string#1:lr del\endcsname\fi
 "\space }\bgroup
                               \HCode{><\a:mathml mrow>}\bgroup}
 \Configure{right}
-   {\egroup\Send{GROUP}{0}{ close="\expandafter
+   {\egroup\Send{GROUP}{0}{ \a:mathml close="\expandafter
 \ifx \csname \string#1:lr del\endcsname\relax #1\else
      \csname \string#1:lr del\endcsname\fi
 "\space}\egroup}
@@ -3208,7 +3209,8 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{array}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \Configure{halignTB<>}{array}{\HCode{\Hnewline
+    \let\columnlines\empty
+\Configure{halignTB<>}{array}{\HCode{\Hnewline
    \a:mathml equalrows="false"
    \a:mathml columnlines="\columnlines"
    \a:mathml equalcolumns="false" \a:mathml class="array"}<>\HAlign}
@@ -4141,7 +4143,5 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
-
-
 \endinput