reorder picture conversion scripts so t4ht -c can work, tex4ht r211, https://puszcza.gnu.org.ua/bugs/?343, http://tug.org/pipermail/tex4ht/2016q4/001689.html

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

1 files changed, 21 insertions, 21 deletions

diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
index c2eda4bec39..c8f6628a52c 100644
--- a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
@@ -1,6 +1,6 @@
-% tex4ht.env-unix (2015-02-15-10:26), generated from tex4ht-env.tex
+% tex4ht.env-unix (2016-12-10-15:36), generated from tex4ht-env.tex
 % (can be used as ~/.tex4ht)
-% Copyright 2009-2015 TeX Users Group
+% Copyright 2009-2016 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -148,25 +148,6 @@ i~/tex4ht.dir/texmf/tex4ht/ht-fonts/alias/!
 %   magnification: -x mag  (e.g., -x 1200)                          %
 %   page size:     -T x,y  (e.g., -T 14in,14in)                     %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- <convert>
- G.png
- 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    
-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 (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 
-%--------- 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
-% Gconvert -crop 0x0 +page -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
- </convert>
 <netpbm>
 Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2  > zz%%4.ps
 Ggs -sDEVICE=ppm -r110 -sOutputFile=zz%%4.ppm -q -dbatch -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -dNOPAUSE zz%%4.ps -c quit
@@ -193,6 +174,25 @@ Gdvipng -T tight -x 1400 -D 72 -bg Transparent -pp %%2:%%2 %%1 -o %%3
 %Grm zz%%4.ps
 </dvipng>
 
+ <convert>
+ G.png
+ 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    
+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 (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 
+%--------- 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
+% Gconvert -crop 0x0 +page -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
+ </convert>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Default scripts, shifted rightward 1 pos
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%