texlive[50393] Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht:

[commits+karl at tug.org]

Revision: 50393
          http://tug.org/svn/texlive?view=revision&revision=50393
Author:   karl
Date:     2019-03-14 22:55:42 +0100 (Thu, 14 Mar 2019)
Log Message:
-----------
ooffice fixes, tex4ht r533-535

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=533

Modified Paths:
--------------
    trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2019-03-14 21:39:33 UTC (rev 50392)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht	2019-03-14 21:55:42 UTC (rev 50393)
@@ -1,4 +1,4 @@
-% ooffice.4ht (2019-03-13-15:06), generated from tex4ht-ooffice.tex
+% ooffice.4ht (2019-03-14-14:55), generated from tex4ht-ooffice.tex
 % Copyright 2009-2019 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 2019-03-13-15:06}
+\immediate\write-1{version 2019-03-14-14:55}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -452,6 +452,14 @@
 
 \Configure{HEAD}{}{}
 \def\svg:width{0.0pt}\def\svg:height{0.0pt}
+\def\def:image:mime:type#1#2{\@namedef{image:mime#1}{#2}}
+\def\get:image:mime:type#1{\@nameuse{image:mime#1}}
+\def:image:mime:type{.png}{image/png}
+\def:image:mime:type{.jpg}{image/jpeg}
+\def:image:mime:type{.jpeg}{image/jpeg}
+\def:image:mime:type{.gif}{image/gif}
+\def:image:mime:type{.svg}{image/svg+xml}
+\def\svg:width{0.0pt}\def\svg:height{0.0pt}
 \Configure{IMG}
   {% \ht:special{t4ht>\PictureFile.4og}%
 \ht:special{t4ht>\Gin at base\Gin at ext.4og}%
@@ -459,7 +467,7 @@
 % \ht:special{t4ht<\PictureFile.4og}%
 \ht:special{t4ht<\Gin at base\Gin at ext.4og}%
 \OOmanifest{<manifest:file-entry
-    manifest:full-path="Pictures/\PictureFile"/>\Hnewline
+    manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\Gin at ext"/>\Hnewline
 }%
 %
    \ht:special{t4ht=<draw:frame
@@ -6871,7 +6879,7 @@
       \Hnewline -->}%
     \egroup}
 \def\getImgFileParser#1/{%
-  \ifx#1\relax
+  \ifx\relax#1\relax
     \let\next\relax
   \else
     \do{#1}\let\next\getImgFileParser
@@ -6880,7 +6888,7 @@
 \newcommand\getImgFile[2]{%
   \def\do##1{\def\imgBaseName{##1#2}\def\imgBase{##1}}
   \def\imgFullName{#1#2}
-  \getImgFileParser#1/\relax/
+  \getImgFileParser#1//
 }
 
 \Configure{graphics*}
@@ -8773,10 +8781,10 @@
 
 \Configure{wrapfloat}
     {\ifvmode\IgnorePar\EndP
-       \HCode{<text:p><text:span text:class-name="wrapfig-\WFplace">}%
+       \HCode{<text:p><text:span text:class-names="wrapfig-\WFplace">}%
        \def\endWrap{\ifvmode\IgnorePar\fi\EndP\HCode{</text:span></text:p>}\par}%
      \else
-       \HCode{<text:span text:class-name="wrapfig-\WFplace">}\bgroup
+       \HCode{<text:span text:class-names="wrapfig-\WFplace">}\bgroup
        \def\endWrap{\egroup\HCode{</text:span>}}%
      \fi
     }
@@ -14304,7 +14312,7 @@
 % \ht:special{t4ht<\PictureFile.4og}%
 \ht:special{t4ht<\Gin at base\Gin at ext.4og}%
 \OOmanifest{<manifest:file-entry
-    manifest:full-path="Pictures/\PictureFile"/>\Hnewline
+    manifest:full-path="Pictures/\PictureFile" manifest:media-type="\get:image:mime:type\Gin at ext"/>\Hnewline
 }%
 %
          \ht:special{t4ht=<draw:frame