summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-14 21:55:42 +0000
committerKarl Berry <karl@freefriends.org>2019-03-14 21:55:42 +0000
commit0606491418cb66bf2d5b47c46523de2c6d75c69b (patch)
tree538396e53f6ead8aafd56195b10e33c925590fd2 /Master/texmf-dist/tex
parent3e58488b7bb119b5efc1d1c575dcef1187f8b117 (diff)
ooffice fixes, tex4ht r533-535
git-svn-id: svn://tug.org/texlive/trunk@50393 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht24
1 files changed, 16 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index b62c80fc955..82cd2e5a134 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 (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 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
\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@base\Gin@ext.4og}%
@@ -459,7 +467,7 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
% \ht:special{t4ht<\PictureFile.4og}%
\ht:special{t4ht<\Gin@base\Gin@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@ext"/>\Hnewline
}%
%
\ht:special{t4ht=<draw:frame
@@ -6871,7 +6879,7 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
\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 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
\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 @@ Y{0178}\i{00EF}%
\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 @@ Y{0178}\i{00EF}%
% \ht:special{t4ht<\PictureFile.4og}%
\ht:special{t4ht<\Gin@base\Gin@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@ext"/>\Hnewline
}%
%
\ht:special{t4ht=<draw:frame