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

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2018-07-04 20:34:48 +0300 (Wed, 04 Jul 2018)
New Revision: 421

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-ooffice.tex
Log:
Fixed validation issues with MathML

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2018-07-04 09:45:43 UTC (rev 420)
+++ trunk/lit/ChangeLog	2018-07-04 17:34:48 UTC (rev 421)
@@ -3,6 +3,9 @@
   * tex4ht-ooffice.tex (ooffice.4ht): removed all DOCTYPE definitions, they
 	cause validation failure in https://odfvalidator.org/. 
 	* tex4ht-ooffice.tex (ooffice-mml.4ht): fixed mime type.
+	Replaced literal math: prefix with \a:mathml in some configurations.
+	Configured \Configure{mathml} to not use a prefix at all.
+	Added correct Doctype for MathML.
 
 2018-07-03  Karl Berry  <karl at freefriends.org>
 

Modified: trunk/lit/tex4ht-ooffice.tex
===================================================================
--- trunk/lit/tex4ht-ooffice.tex	2018-07-04 09:45:43 UTC (rev 420)
+++ trunk/lit/tex4ht-ooffice.tex	2018-07-04 17:34:48 UTC (rev 421)
@@ -131,13 +131,13 @@
 \<configure ooffice-mml tex4ht\><<<
 \Configure{math-xmlns}
   { 
-     xmlns:math="http://www.w3.org/1998/Math/MathML"\Hnewline
+     xmlns="http://www.w3.org/1998/Math/MathML"\Hnewline
      xmlns:xlink="http://www.w3.org/1999/xlink"
  }
 >>>
 
 \<configure ooffice-mml Preamble\><<<
-\Configure{mathml}{math:}
+\Configure{mathml}{}
 >>>
 
 \<configure ooffice Preamble\><<<
@@ -854,7 +854,7 @@
 
 
 \<config mathml object file\><<<
-\Configure{DOCTYPE}{}%
+\Configure{DOCTYPE}{\HCode{<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">}}%
 |<oo math xtpipes|>%
 \Configure{HTML}{}{\noindent}%
 \Configure{BODY}{}{}%
@@ -873,6 +873,7 @@
 >>>
 
 \<tex4ht math note\><<<
+<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">\Hnewline
 <?xtpipes file="oo-math.4xt" ?>\Hnewline
 <!-- |<math obj name|>\space
      by TeX4ht from \jobname.tex line \the\inputlineno\space
@@ -5824,7 +5825,7 @@
 
 
 \<mml mtd hline\><<<
-<\a:mathml mtd><math:mo> \string&\#x0332; </math:mo></\a:mathml mtd>
+<\a:mathml mtd><\a:mathml mo> \string&\#x0332; </\a:mathml mo></\a:mathml mtd>
 >>>
 
 
@@ -9840,9 +9841,9 @@
 
 \<configure ooffice ulem\><<<
 \Configure{uline}
-     {\ifmmode \HCode{<math:mrow class="uline">}%
+     {\ifmmode \HCode{<\a:mathml mrow class="uline">}%
       \else \HCode{<text:span text:style-name="uline">}\fi}
-     {\ifmmode \HCode{</math:mrow>}\else \HCode{</text:span>}\fi}
+     {\ifmmode \HCode{</\a:mathml mrow>}\else \HCode{</text:span>}\fi}
 \NewConfigureOO{uline}
 \ConfigureOO{uline}{|<oo uline style|>}
 >>>
@@ -9860,9 +9861,9 @@
 
 \<configure ooffice ulem\><<<
 \Configure{uuline}
-     {\ifmmode \HCode{<math:mrow class="uuline">}%
+     {\ifmmode \HCode{<\a:mathml mrow class="uuline">}%
       \else \HCode{<text:span text:style-name="uuline">}\fi}
-     {\ifmmode \HCode{</math:mrow>}\else \HCode{</text:span>}\fi}
+     {\ifmmode \HCode{</\a:mathml mrow>}\else \HCode{</text:span>}\fi}
 \NewConfigureOO{uuline}
 \ConfigureOO{uuline}{|<oo uuline style|>}
 >>>
@@ -9879,9 +9880,9 @@
 
 \<configure ooffice ulem\><<<
 \Configure{uwave}
-     {\ifmmode \HCode{<math:mrow class="uwave">}%
+     {\ifmmode \HCode{<\a:mathml mrow class="uwave">}%
       \else \HCode{<text:span text:style-name="uwave">}\fi}
-     {\ifmmode \HCode{</math:mrow>}\else \HCode{</text:span>}\fi}
+     {\ifmmode \HCode{</\a:mathml mrow>}\else \HCode{</text:span>}\fi}
 \NewConfigureOO{uwave}
 \ConfigureOO{uwave}{|<oo uwave style|>}
 >>>
@@ -9901,9 +9902,9 @@
 
 \<configure ooffice ulem\><<<
 \Configure{sout}
-     {\ifmmode \HCode{<math:mrow class="sout">}%
+     {\ifmmode \HCode{<\a:mathml mrow class="sout">}%
       \else \HCode{<text:span text:style-name="sout">}\fi}
-     {\ifmmode \HCode{</math:mrow>}\else \HCode{</text:span>}\fi}
+     {\ifmmode \HCode{</\a:mathml mrow>}\else \HCode{</text:span>}\fi}
 \NewConfigureOO{sout}
 \ConfigureOO{sout}{|<oo sout style|>}
 >>>
@@ -9920,9 +9921,9 @@
 
 \<configure ooffice ulem\><<<
 \Configure{xout}
-     {\ifmmode \HCode{<math:mrow class="xout">}%
+     {\ifmmode \HCode{<\a:mathml mrow class="xout">}%
       \else \HCode{<text:span text:style-name="xout">}\fi}
-     {\ifmmode \HCode{</math:mrow>}\else \HCode{</text:span>}\fi}
+     {\ifmmode \HCode{</\a:mathml mrow>}\else \HCode{</text:span>}\fi}
 \NewConfigureOO{xout}
 \ConfigureOO{xout}{|<oo xout style|>}
 >>>