odt output fixes, tex4ht r419,420,421

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

2 files changed, 33 insertions, 85 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
index c7afa162f62..a6ff9f79ef9 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice-mml.4ht
@@ -1,5 +1,5 @@
-% ooffice-mml.4ht (2017-10-23-16:54), generated from tex4ht-ooffice.tex
-% Copyright 2009-2017 TeX Users Group
+% ooffice-mml.4ht (2018-07-04-14:25), generated from tex4ht-ooffice.tex
+% Copyright 2009-2018 TeX Users Group
 % Copyright 2001-2009 Maarten Wisse, James Naughton, 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 2017-10-23-16:54}
+\immediate\write-1{version 2018-07-04-14:25}
 
   \exit:ifnot{Preamble,% 
 amsmath,% 
@@ -29,7 +29,7 @@ tex4ht}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{Preamble}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    \Configure{mathml}{math:}
+    \Configure{mathml}{}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   
@@ -41,7 +41,7 @@ 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"
  }
 \HAssign\math:obj=0
@@ -95,36 +95,22 @@ tex4ht}
    manifest:full-path="\jobname-m\math:obj
 /settings.xml"/>\Hnewline
 <manifest:file-entry
-    manifest:media-type="application/vnd.sun.xml.math"
+    manifest:media-type="application/vnd.oasis.opendocument.formula"
     manifest:full-path="\jobname-m\math:obj
 /"/>
 }%
-    \Configure{DOCTYPE}{\HCode{<!DOCTYPE \a:mathml math PUBLIC
-    "-//W3C//DTD MathML 2.0//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-"
-    "math.dtd">\Hnewline}
-}%
+    \Configure{DOCTYPE}{\HCode{<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">}}%
 \:CheckOption{-xtpipes} \if:Option
    \Log:Note{Use the `-xtpipes' command line option to
              avoid xtpipes post processing}
 \else
       \Configure{DOCTYPE}{%%
-          \HCode{<!DOCTYPE \a:mathml math PUBLIC
-    "-//W3C//DTD MathML 2.0//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-"
-    "math.dtd">\Hnewline}
-%
-          \HCode{<?xtpipes file="oo-math.4xt" ?>\Hnewline
+          \HCode{<!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
 <!-- \jobname-m\math:obj
 \space
      by TeX4ht from \jobname.tex line \the\inputlineno\space
-     2017-10-23-16:54\Hnewline
+     2018-07-04-14:25\Hnewline
      (http://www.cse.ohio-state.edu/\string ~gurari/TeX4ht/)
       -->\Hnewline
 }%
@@ -287,7 +273,7 @@ tex4ht}
    {\ifmathml <\a:mathml mtr\Hnewline class="hline">
  \else     <table:table-row  \Hnewline table:style-name="hline-row">%
 \fi}
-{\ifmathml <\a:mathml mtd><math:mo> \string&\#x0332; </math:mo></\a:mathml mtd>
+{\ifmathml <\a:mathml mtd><\a:mathml mo> \string&\#x0332; </\a:mathml mo></\a:mathml mtd>
 
    \else   <table:table-cell table:style-name="hline-cell"
                          table:value-type="string">%
@@ -306,7 +292,7 @@ tex4ht}
           <text:p text:style-name="cline-p"  />%
        </table:table-cell>\Hnewline
 \fi }
-{\ifmathml <\a:mathml mtd><math:mo> \string&\#x0332; </math:mo></\a:mathml mtd>
+{\ifmathml <\a:mathml mtd><\a:mathml mo> \string&\#x0332; </\a:mathml mo></\a:mathml mtd>
 
  \else <table:table-cell table:style-name="cline-cell">%
           <text:p text:style-name="cline-p-hr"  />%
@@ -500,6 +486,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{amsmath}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -643,6 +630,9 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{array}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1059,5 +1049,7 @@ accent="true">&\#x0332;</\a:mathml mo></\a:mathml munder>}%
 
 
 
+
+
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index d067f55d7e6..a2561d5c7b8 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
@@ -1,4 +1,4 @@
-% ooffice.4ht (2018-06-13-14:03), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2018-07-04-14:25), generated from tex4ht-ooffice.tex
 % Copyright 2009-2018 TeX Users Group
 % Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
 %
@@ -17,7 +17,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2018-06-13-14:03}
+\immediate\write-1{version 2018-07-04-14:25}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -129,13 +129,6 @@ xcolor}
 \def\OOstyles#1{\edef\:OOstyles{\:OOstyles #1}}
 \OOstyles{<?xml version="1.0" encoding="UTF-8"?>\Hnewline
 %
-<!DOCTYPE office:document-styles PUBLIC
-    "-//OpenOffice.org//DTD OfficeDocument \oo:dtd:ver//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-"
-    "office.dtd">\Hnewline
 <office:document-styles \Hnewline
        xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"\Hnewline
 xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"  \Hnewline
@@ -194,13 +187,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink"\Hnewline
 \def\OOmanifest#1{\edef\:OOmanifest{\:OOmanifest #1}}
 \OOmanifest{<?xml version="1.0" encoding="UTF-8"?>\Hnewline
 %
-<!DOCTYPE manifest:manifest PUBLIC
-       "-//OpenOffice.org//DTD
-       Manifest \oo:dtd:ver//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-" "Manifest.dtd">\Hnewline
 <manifest:manifest
        xmlns:manifest =
        "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">\Hnewline
@@ -247,24 +233,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink"\Hnewline
 \Configure{VERSION}{\HCode{<?xml version="1.0" encoding="UTF-8"?>\Hnewline
 }}
 \:CheckOption{-xtpipes} \if:Option
-   \Configure{DOCTYPE}{\HCode{<!DOCTYPE office:document-content PUBLIC
-   "-//OpenOffice.org//DTD OfficeDocument \oo:dtd:ver//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-"
-   "office.dtd">\Hnewline
-}}
+   \Configure{DOCTYPE}{}
 \else
-   \Configure{DOCTYPE}{\HCode{<!DOCTYPE office:document-content PUBLIC
-   "-//OpenOffice.org//DTD OfficeDocument \oo:dtd:ver//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-"
-   "office.dtd">\Hnewline
-\Hnewline
-        <?xtpipes file="oo-text.4xt" ?>\Hnewline}}
+   \Configure{DOCTYPE}{\HCode{<?xtpipes file="oo-text.4xt" ?>\Hnewline}}
 \fi
       {\Configure{Needs}{File: \jobname.odt}\Needs{}}
    \Configure{HTML}
@@ -383,14 +354,7 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
   {\ht:special{t4ht>\jobname-settings.4os}%
   \ht:special{t4ht=<?xml version="1.0" encoding="UTF-8"?>\Hnewline
 }%
-  \ht:special{t4ht=<!DOCTYPE office:document-settings PUBLIC
-    "-//OpenOffice.org//DTD OfficeDocument \oo:dtd:ver//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-"
-    "office.dtd">\Hnewline
-}%
+  \ht:special{t4ht=}%
   \ht:special{t4ht=<office:document-settings \Hnewline
    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" \Hnewline
    xmlns:xlink="http://www.w3.org/1999/xlink"       \Hnewline
@@ -423,14 +387,6 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
    \ht:special{t4ht>\jobname-meta.4ot}%
   \ht:special{t4ht=<?xml version="1.0" encoding="UTF-8"?>\Hnewline
 }%
-  \ht:special{t4ht=<!DOCTYPE office:document-meta PUBLIC
-    "-//OpenOffice.org//DTD OfficeDocument \oo:dtd:ver//\expandafter
-\ifx \csname a:dtd-lang\endcsname\relax EN\else
-  \csname a:dtd-lang\endcsname
-\fi
-"
-    "office.dtd">\Hnewline
-}%
   \ht:special{t4ht=<office:document-meta \Hnewline
   xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"\Hnewline
   xmlns:xlink="http://www.w3.org/1999/xlink"\Hnewline
@@ -14361,9 +14317,9 @@ Y{0178}\i{00EF}%
                 \ConfigureHinput{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}{<style:style style:name="uline" style:family="text">
     <style:text-properties style:text-underline-style="solid"
@@ -14373,9 +14329,9 @@ Y{0178}\i{00EF}%
 </style:style>
 }
 \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}{<style:style style:name="uuline" style:family="text">
     <style:text-properties style:text-underline-style="solid"
@@ -14385,9 +14341,9 @@ Y{0178}\i{00EF}%
 </style:style>
 }
 \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}{<style:style style:name="uwave" style:family="text">
     <style:text-properties style:text-underline-style="wave"
@@ -14397,9 +14353,9 @@ Y{0178}\i{00EF}%
 </style:style>
 }
 \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}{<style:style style:name="sout" style:family="text">
    <style:text-properties style:text-line-through-style="solid"
@@ -14407,9 +14363,9 @@ Y{0178}\i{00EF}%
 </style:style>
 }
 \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}{<style:style style:name="xout" style:family="text">
    <style:text-properties style:text-line-through-style="solid"