for ooffice: all images in subdir Pictures/; sync from tex4ht r144

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

1 files changed, 47 insertions, 24 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
index fea7098f3fa..11c31abd0c7 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht
@@ -1,8 +1,6 @@
-% ooffice.4ht (2013-03-01-11:40), generated from tex4ht-ooffice.tex
-% Copyright (C) 2009-2010 TeX Users Group
-% Copyright (C) 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
-% Maarten.Wisse@urz.uni-heidelberg.de, http://home.wanadoo.nl/pmwisse
-% james.naughton@st-edmund-hall.oxford.ac.uk
+% ooffice.4ht (2015-02-15-10:26), generated from tex4ht-ooffice.tex
+% Copyright 2009-2015 TeX Users Group
+% Copyright 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -18,7 +16,8 @@
 % is the TeX4ht Project <http://tug.org/tex4ht>.
 %
 % If you modify this program, changing the
-% version identification would be appreciated.\immediate\write-1{version 2013-03-01-11:40}
+% version identification would be appreciated.
+\immediate\write-1{version 2015-02-15-10:26}
 
   \exit:ifnot{Preamble,% 
 algorithmicx,% 
@@ -489,15 +488,15 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
 \Configure{HEAD}{}{}
 \def\svg:width{0.0pt}\def\svg:height{0.0pt}
 \Configure{IMG}
-  {\ht:special{t4ht>\PictureFile.4og}%
+  {\ht:special{t4ht>\imgFullName.4og}%
 \ht:special{t4ht*>}%
-\ht:special{t4ht<\PictureFile.4og}%
+\ht:special{t4ht<\imgFullName.4og}%
 \OOmanifest{<manifest:file-entry
-    manifest:full-path="Pictures/\PictureFile"/>\Hnewline
+    manifest:full-path="Pictures/\imgBaseName"/>\Hnewline
 }%
 %
    \ht:special{t4ht=<draw:frame
-      draw:name="\PictureFile"
+      draw:name="\imgBaseName"
       text:anchor-type="as-char"  % "paragraph"
 %      svg:width="...pt"
 %      svg:height="...pt"
@@ -509,6 +508,10 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
          xlink:type="simple"
         xlink:show="embed"
         xlink:actuate="onLoad"
+        \ifx\noBoundingBox\UnDefined
+         \string svg:width="\the\Gin@req@width"
+          svg:height="\the\Gin@req@height"
+        \fi
         /><!--draw:name="}}
   {" }
   {\ht:special{t4ht=" }}
@@ -6890,30 +6893,47 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew
        svg:height="\the\Gin@req@height"
       \Hnewline -->}%
     \egroup}
+\def\getImgFileParser#1/{%
+  \ifx#1\relax
+    \let\next\relax
+  \else
+    \do{#1}\let\next\getImgFileParser
+  \fi\next
+}
+\newcommand\getImgFile[2]{%
+  \def\do##1{\def\imgBaseName{##1#2}\def\imgBase{##1}}
+  \def\imgFullName{#1#2}
+  \getImgFileParser#1/\relax/
+}
+
 \Configure{graphics*}
    {gif}
-   {\Picture[IMG]{\Gin@base.gif \ifx\noBoundingBox\UnDefined
+   {\expandafter\getImgFile\expandafter{\Gin@base}{\PictExt}
+\Picture[IMG]{\imgBase.gif \ifx\noBoundingBox\UnDefined
    svg:width="\the\Gin@req@width"
    svg:height="\the\Gin@req@height"
 \fi
  }}
 \Configure{graphics*}
    {png}
-   {\Picture[IMG]{\Gin@base.png \ifx\noBoundingBox\UnDefined
+   {\expandafter\getImgFile\expandafter{\Gin@base}{\PictExt}
+\Picture[IMG]{\imgBase.png \ifx\noBoundingBox\UnDefined
    svg:width="\the\Gin@req@width"
    svg:height="\the\Gin@req@height"
 \fi
  }}
 \Configure{graphics*}
    {jpg}
-   {\Picture[IMG]{\Gin@base.jpg  \ifx\noBoundingBox\UnDefined
+   {\expandafter\getImgFile\expandafter{\Gin@base}{\PictExt}
+\Picture[IMG]{\imgBase.jpg  \ifx\noBoundingBox\UnDefined
    svg:width="\the\Gin@req@width"
    svg:height="\the\Gin@req@height"
 \fi
  }}
 \Configure{graphics*}
    {jpeg}
-   {\Picture[IMG]{\Gin@base.jpeg \ifx\noBoundingBox\UnDefined
+   {\expandafter\getImgFile\expandafter{\Gin@base}{\PictExt}
+\Picture[IMG]{\imgBase.jpeg \ifx\noBoundingBox\UnDefined
    svg:width="\the\Gin@req@width"
    svg:height="\the\Gin@req@height"
 \fi
@@ -8116,7 +8136,6 @@ Y{0178}\i{00EF}%
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{biblatex}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8624,6 +8643,12 @@ Y{0178}\i{00EF}%
 
 
 
+
+
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{apacite}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14135,15 +14160,15 @@ Y{0178}\i{00EF}%
     \Configure{jtree}
   {\bgroup
       \Configure{IMG}
-        {\ht:special{t4ht>\PictureFile.4og}%
+        {\ht:special{t4ht>\imgFullName.4og}%
 \ht:special{t4ht*>}%
-\ht:special{t4ht<\PictureFile.4og}%
+\ht:special{t4ht<\imgFullName.4og}%
 \OOmanifest{<manifest:file-entry
-    manifest:full-path="Pictures/\PictureFile"/>\Hnewline
+    manifest:full-path="Pictures/\imgBaseName"/>\Hnewline
 }%
 %
          \ht:special{t4ht=<draw:frame
-            draw:name="\PictureFile"
+            draw:name="\imgBaseName"
             text:anchor-type="as-char"
             draw:style-name="jtree"
             draw:z-index="0"
@@ -14203,6 +14228,7 @@ Y{0178}\i{00EF}%
 
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{algorithmicx}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14284,7 +14310,6 @@ Y{0178}\i{00EF}%
 
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{ulem}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14351,7 +14376,6 @@ Y{0178}\i{00EF}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{paralist}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14646,6 +14670,7 @@ Y{0178}\i{00EF}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{listings}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14770,7 +14795,6 @@ Y{0178}\i{00EF}%
 \endinput\empty\empty\empty\empty\empty\empty
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{lineno}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14804,8 +14828,6 @@ Y{0178}\i{00EF}%
 
 
 
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{footmisc}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -14988,5 +15010,6 @@ Y{0178}\i{00EF}%
 
 
 
+
 \endinput