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, 28 insertions, 34 deletions

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