summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-15 18:28:47 +0000
committerKarl Berry <karl@freefriends.org>2015-02-15 18:28:47 +0000
commit0d7717ecf698ce267020b7f955fecfdf936d6fb3 (patch)
tree3f626780a87339038f5f4d1152d17cfcb443a733 /Master/texmf-dist
parent37879b019497485163b89aa84d3c4302d039445b (diff)
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
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/ooffice.4ht71
-rw-r--r--Master/texmf-dist/tex4ht/base/unix/tex4ht.env62
2 files changed, 75 insertions, 58 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
diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
index 0e6eace010e..c2eda4bec39 100644
--- a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
@@ -1,23 +1,23 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.env / .tex4ht (unix) 2014-02-10
-% Copyright (C) 2010--2014 TeX Users Group
-% Copyright (C) 1997--2009 Eitan M. Gurari %
-% %
-% This work may be distributed and/or modified under the %
-% conditions of the LaTeX Project Public License, either %
-% version 1.3 of this license or (at your option) any %
-% later version. The latest version of this license is %
-% in %
-% http://www.latex-project.org/lppl.txt %
-% and version 1.3 or later is part of all distributions %
-% of LaTeX version 2003/12/01 or later. %
-% %
-% This work has the LPPL maintenance status "maintained".%
-% %
-% This Current Maintainer of this work %
+% tex4ht.env-unix (2015-02-15-10:26), generated from tex4ht-env.tex
+% (can be used as ~/.tex4ht)
+% Copyright 2009-2015 TeX Users Group
+% Copyright 1997-2009 Eitan M. Gurari
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
% is the TeX4ht Project <http://tug.org/tex4ht>.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% If you modify this program, changing the
+% version identification would be appreciated.%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Notes: %
% 1. Empty lines might be harmful %
@@ -157,15 +157,10 @@ G.svg
Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.eps
Gpstoedit -f svg zz%%4.eps %%3
G.
-%echo "dbg: got to dvips to png via gs"
-% these are the same commands as for .png above.
+%echo "dbg: got to dvips to png via gs (unix dvips convert)"
Gdvips -E -q -Ppdf -f %%1 -pp %%2 > zz%%4.ps
-Ggs -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit
-Grm zz%%4.ps
-%--------- let's not use convert, to simplify mactex.
-% Gdvips -E -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.ps
-% Gconvert -trim +repage -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3
-% Grm zz%%4.ps
+Ggs -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit
+Grm zz%%4.ps
%--------- alternative instructions for old versions of convert
% Gconvert -trim -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
% Gconvert -crop 0x0 +repage -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
@@ -186,17 +181,16 @@ Grm temp.ppm
</netpbm>
<dvipng>
G.png
+%echo "dbg: got to dvi to png via (dvipng)"
Gdvipng -T tight -x 1400 -D 72 -bg Transparent -pp %%2:%%2 %%1 -o %%3
G.gif
Gdvipng -T tight -x 1400 -D 72 -bg Transparent -gif -pp %%2:%%2 %%1 -o %%3
G.
-%echo "dbg: got to dvi to png via dvipng"
Gdvipng -T tight -x 1400 -D 72 -bg Transparent -pp %%2:%%2 %%1 -o %%3
-%--------- let's not use convert, to simplify mactex.
-% G.
+% avoiding convert for mactex.
% Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.ps
% Gconvert -crop 0x0 -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3
-% Grm zz%%4.ps
+%Grm zz%%4.ps
</dvipng>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -300,9 +294,9 @@ S*
.4ot mv %%1.4ot sxw-%%0.dir/meta.xml
.4oy mv %%1.4oy sxw-%%0.dir/styles.xml
% .4og cp --parents %%1 Pictures
-.4og mkdir -p sxw-%%0.dir/Pictures/%%1
-.4og rmdir sxw-%%0.dir/Pictures/%%1
-.4og cp %%1 sxw-%%0.dir/Pictures/%%1
+% .4og mkdir -p sxw-%%0.dir/Pictures/%%1
+% .4og rmdir sxw-%%0.dir/Pictures/%%1
+.4og cp %%1 sxw-%%0.dir/Pictures/
%-- sxw -- %
.4ox cd sxw-%%0.dir; zip -r %%0.sxw * ; cd ..
% %
@@ -320,5 +314,5 @@ S*
%%% end openoffice %
</oo>
%
-% end of file %
+% end of file