[tex4ht-commits] [SCM] tex4ht updated: r200 - trunk/lit

michal_h21 at gnu.org.ua michal_h21 at gnu.org.ua
Tue Nov 22 16:47:46 CET 2016


Author: michal_h21
Date: 2016-11-22 17:47:46 +0200 (Tue, 22 Nov 2016)
New Revision: 200

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-mathml.tex
   trunk/lit/tex4ht-ooffice.tex
Log:
Added a:mathml commands before attributes, to ensure that mathml: prefix is used when needed

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2016-11-21 22:09:47 UTC (rev 199)
+++ trunk/lit/ChangeLog	2016-11-22 15:47:46 UTC (rev 200)
@@ -1,5 +1,12 @@
+2016-11-22 Michal Hoftich <michal.h21 at gmail.com>
+	* tex4ht-mathml.tex (mathml.4ht): added \a:mathml commands before some
+	attributes where it was missing. This ensures use of mathml: prefix if it is
+	used in the output format
+	* tex4ht-ooffice.tex (ooffice-mml.4ht): Removed configurations of 'left' and
+	'right', default  configurations from mathml.4ht should be used instead
+
 2016-11-21 Michal Hoftich <michal.h21 at gmail.com>
-	* tex4ht-mathml.tex: added \let\columnlines\empty before use of \columnlines
+	* tex4ht-mathml.tex (mathml.4ht): added \let\columnlines\empty before use of \columnlines
 	in \Configure{halignTB<>}. It caused compilation error in ooffice mode.
 
 2016-10-05 Deimantas Galcius <deimantas.galcius at gmail.com>

Modified: trunk/lit/tex4ht-mathml.tex
===================================================================
--- trunk/lit/tex4ht-mathml.tex	2016-11-21 22:09:47 UTC (rev 199)
+++ trunk/lit/tex4ht-mathml.tex	2016-11-22 15:47:46 UTC (rev 200)
@@ -1422,9 +1422,9 @@
       \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="|<lr del 2|>" close="|<lr del 3|>"><\a:mathml mfrac
-          linethickness="0"><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="|<lr del 2|>" \a:mathml close="|<lr del 3|>"><\a:mathml mfrac
+          \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>}
@@ -1458,9 +1458,9 @@
       \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="|<lr del 2|>" close="|<lr del 3|>"><\a:mathml mfrac
-          linethickness="\the\tmp:dim"><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="|<lr del 2|>" \a:mathml close="|<lr del 3|>"><\a:mathml mfrac
+          \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>}
@@ -1476,9 +1476,9 @@
       \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="|<lr del 2|>" close="|<lr del 3|>"><\a:mathml mfrac
-          linethickness="0"><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="|<lr del 2|>" \a:mathml close="|<lr del 3|>"><\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></\a:mathml mfenced>}
@@ -1493,8 +1493,8 @@
       \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="|<lr del 2|>" close="|<lr del 3|>"><\a:mathml mfrac><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="|<lr del 2|>" \a:mathml close="|<lr del 3|>"><\a:mathml mfrac><\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>}
@@ -1514,9 +1514,9 @@
       \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="|<lr del 2|>" close="|<lr del 3|>"><\a:mathml mfrac
-          linethickness="\the\tmp:dim"><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="|<lr del 2|>" \a:mathml close="|<lr del 3|>"><\a:mathml mfrac
+          \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>}
@@ -1528,13 +1528,13 @@
    {}
 \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="|<lr del 2|>" close="|<lr del 3|>"><\a:mathml mfrac
-          linethickness="0"><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="|<lr del 2|>" \a:mathml close="|<lr del 3|>"><\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></\a:mathml mfenced>}
@@ -1549,8 +1549,8 @@
       \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="|<lr del 2|>" close="|<lr del 3|>"><\a:mathml mfrac><\a:mathml mrow>}%
+      \Send{GROUP}{0}{<\a:mathml mfenced \a:mathml separators=""\Hnewline
+          \a:mathml open="|<lr del 2|>" \a:mathml close="|<lr del 3|>"><\a:mathml mfrac><\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>}
@@ -1828,11 +1828,11 @@
 \def\:temp#1{\a:right{#1}\o:right:.\b:right{#1}}\HLet\right|=\:temp
 \Configure{left}
    {}
-   {\HCode{<\a:mathml mfenced separators=""\Hnewline 
-       open="|<lr del 1|>"\space }\bgroup 
+   {\HCode{<\a:mathml mfenced \a:mathml separators=""\Hnewline 
+       \a:mathml open="|<lr del 1|>"\space }\bgroup 
                               \HCode{><\a:mathml mrow>}\bgroup}
 \Configure{right}
-   {\egroup\Send{GROUP}{0}{ close="|<lr del 1|>"\space}\egroup}
+   {\egroup\Send{GROUP}{0}{ \a:mathml close="|<lr del 1|>"\space}\egroup}
    {\HCode{</\a:mathml mrow></\a:mathml mfenced>}}
 \def\def:DEL#1{\def\:DEL{#1}}
 \def\check:DEL#1#2{\def\:tempa{#1}\ifx \:tempa\:DEL \def\:DEL{#2}\fi}

Modified: trunk/lit/tex4ht-ooffice.tex
===================================================================
--- trunk/lit/tex4ht-ooffice.tex	2016-11-21 22:09:47 UTC (rev 199)
+++ trunk/lit/tex4ht-ooffice.tex	2016-11-22 15:47:46 UTC (rev 200)
@@ -11216,11 +11216,9 @@
 \end{verbatim}
 
 \<configure ooffice-mml latex\><<<
-|<mfenced patches|>
 >>>
 
 \<configure ooffice-mml plain\><<<
-|<mfenced patches|>
 >>>
 
 



More information about the tex4ht-commits mailing list