tex4ht use dvisvgm and dvipng by default, tex4ht r239,240,241

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

2 files changed, 141 insertions, 140 deletions

diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
index c8f6628a52c..9ba378e9c58 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 (2016-12-10-15:36), generated from tex4ht-env.tex
+% tex4ht.env-unix (2017-02-04-08:50), generated from tex4ht-env.tex
 % (can be used as ~/.tex4ht)
-% Copyright 2009-2016 TeX Users Group
+% Copyright 2009-2017 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -160,28 +160,13 @@ Grm zz%%4.ppm
 Grm temp.ppm
 % Gppmtogif -interlace -transparent 1,1,1 zz%%4.ppm > %%3 
 </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.
-Gdvipng -T tight -x 1400 -D 72 -bg Transparent -pp %%2:%%2 %%1 -o %%3
-% 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
-</dvipng>
-
- <convert>
+<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      
+Gdvisvgm -n -p %%2 -c 1.4,1.4 -s %%1 > %%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
@@ -192,7 +177,23 @@ Grm zz%%4.ps
 % 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>
+</convert>
+ <dvipng>
+G.png
+%echo "dbg: got to dvi to png via (dvipng)"
+Gdvipng -T tight -D 144 -bg Transparent -pp %%2:%%2 %%1 -o %%3
+G.gif
+Gdvipng -T tight -D 144 -bg Transparent -gif -pp %%2:%%2 %%1 -o %%3
+G.svg
+Gdvisvgm -n -p %%2 -c 1.4,1.4 -s %%1 > %%3  
+G.
+Gdvipng -T tight -D 144 -bg Transparent -pp %%2:%%2 %%1 -o %%3
+% 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
+  </dvipng>
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Default scripts, shifted rightward 1 pos
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
index 345f9fcfe74..d18c8652776 100644
--- a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
@@ -1,25 +1,22 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.env (ms win)                   2009-01-20-20:54 %
-% 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                   %
-% is Eitan M. Gurari.                                    %
-%                                                        %
-%                             gurari@cse.ohio-state.edu  %
-%                 http://www.cse.ohio-state.edu/~gurari  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%   
+% tex4ht.env-win32 (2017-02-04-08:50), generated from tex4ht-env.tex
+% Copyright 2009-2017 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                                  %
@@ -52,97 +49,97 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
-% tc:/path/tfm!
+tc:\path\tfm!
 %
 <default>
-i/tex4ht/ht-fonts/iso8859/1/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/unicode/!
+i%%~/texmf-dist\tex4ht\ht-fonts\iso8859\1\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
 </default>
 
 <mozhtf>
-i/tex4ht/ht-fonts/mozilla/!
-i/tex4ht/ht-fonts/unicode/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
+i%%~/texmf-dist\tex4ht\ht-fonts\mozilla\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
 </mozhtf>
 
 <iso2htf>
-i/tex4ht/ht-fonts/iso8859/2/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/unicode/!
+i%%~/texmf-dist\tex4ht\ht-fonts\iso8859\2\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
 </iso2htf>
 
 <iso5htf>
-i/tex4ht/ht-fonts/iso8859/5/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/unicode/!
+i%%~/texmf-dist\tex4ht\ht-fonts\iso8859\5\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
 </iso5htf>
 
 <iso7htf>
-i/tex4ht/ht-fonts/iso8859/7/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/unicode/!
+i%%~/texmf-dist\tex4ht\ht-fonts\iso8859\7\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
 </iso7htf>
 
 <iso8htf>
-i/tex4ht/ht-fonts/iso8859/8/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/unicode/!
+i%%~/texmf-dist\tex4ht\ht-fonts\iso8859\8\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
 </iso8htf>
 
 <iso15htf>
-i/tex4ht/ht-fonts/iso8859/15/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/unicode/!
+i%%~/texmf-dist\tex4ht\ht-fonts\iso8859\15\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
 </iso15htf>
 
 <koi8rhtf>
-i/tex4ht/ht-fonts/koi/8r/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/unicode/!
+i%%~/texmf-dist\tex4ht\ht-fonts\koi\8r\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
 </koi8rhtf>
 
 <symhtf>
-i/tex4ht/ht-fonts/symbol/!
-i/tex4ht/ht-fonts/unicode/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
+i%%~/texmf-dist\tex4ht\ht-fonts\symbol\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
 </symhtf>
 
 <win1251htf>
-i/tex4ht/ht-fonts/win/1251/!
-i/tex4ht/ht-fonts/unicode/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
+i%%~/texmf-dist\tex4ht\ht-fonts\win\1251\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
 </win1251htf>
 
 <unihtf>
-i/tex4ht/ht-fonts/unicode/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
 </unihtf>
 
 <emspkhtf>
-i/tex4ht/ht-fonts/html-speech/!
-i/tex4ht/ht-fonts/unicode/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
-i/tex4ht/ht-fonts/css/emacspeak/!
+i%%~/texmf-dist\tex4ht\ht-fonts\html-speech\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
+i%%~/texmf-dist\tex4ht\ht-fonts\css\emacspeak\!
 </emspkhtf>
 
 <jsmlhtf>
-i/tex4ht/ht-fonts/jsml/!
-i/tex4ht/ht-fonts/unicode/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
+i%%~/texmf-dist\tex4ht\ht-fonts\jsml\!
+i%%~/texmf-dist\tex4ht\ht-fonts\unicode\!
+i%%~/texmf-dist\tex4ht\ht-fonts\ascii\!
+i%%~/texmf-dist\tex4ht\ht-fonts\alias\!
 </jsmlhtf>
 
 %
@@ -154,26 +151,6 @@ i/tex4ht/ht-fonts/alias/!
 %   magnification: -x mag  (e.g., -x 1200)                          %
 %   page size:     -T x,y  (e.g., -T 14in,14in)                     %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- <convert>
-G.png
-Gif exist zz%%4.ps DEL zz%%4.ps >nul
-Gif exist %%3 DEL %%3 >nul
-Gdvips -E -q -Ppdf -f %%1 -pp %%2 > zz%%4.ps
-Grungs -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit
-Gif exist zz%%4.ps DEL zz%%4.ps >nul 
-G.svg
-Gif exist zz%%4.ps DEL zz%%4.ps >nul
-Gif exist %%3 DEL %%3 >nul
-Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.eps
-Gpstoedit -f svg zz%%4.eps %%3
-Gif exist zz%%4.ps DEL zz%%4.ps >nul 
- G.
- Gif exist zz%%4.ps DEL zz%%4.ps >nul
- Gif exist %%3 DEL %%3 >nul
- 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
- Gif exist zz%%4.ps DEL zz%%4.ps >nul   
- </convert>
 %--------- 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
@@ -184,7 +161,7 @@ Gif exist  zz%%4.ps DEL zz%%4.ps
 Gif exist zz%%4.ppm DEL zz%%4.ppm
 Gif exist temp.ppm DEL temp.ppm
 Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2  > zz%%4.ps
-Grungs -sDEVICE=ppm -r110 -sOutputFile=zz%%4.ppm -q -dbatch -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -dNOPAUSE zz%%4.ps -c quit
+Ggswin32c -sDEVICE=ppm -r110 -sOutputFile=zz%%4.ppm -q -dbatch -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -dNOPAUSE zz%%4.ps -c quit
 Gmove /y zz%%4.ppm temp.ppm
 Gpnmcrop  temp.ppm > zz%%4.ppm
 Gif exist %%3 DEL %%3
@@ -194,24 +171,46 @@ Gif exist zz%%4.ppm DEL zz%%4.ppm
 Gif exist temp.ppm DEL temp.ppm
 % Gppmtogif -interlace -transparent 1,1,1 zz%%4.ppm > %%3   
 </netpbm>
-<dvipng>
-G.png
-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.
- Gdvips -Ppdf -mode ibmvga -D 110 -f %%1 -pp %%2 > zz%%4.ps
- Gconvert -crop 0x0 -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3
- GDEL zz%%4.ps
-</dvipng>
 <gs>
 Gif exist zz%%4.ps DEL zz%%4.ps >nul
 Gif exist %%3 DEL %%3 >nul
 Gdvips -E -q -Ppdf -D 110 -mode ibmvga -f %%1 -pp %%2 -o zz%%4.ps
-Grungs -dbatch -dNOPAUSE -sDEVICE=pngalpha -dEPSCrop ``-dBackgroundColor=16#ffffff'' -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -r110x110 -sOutputFile=%%3 -q zz%%4.ps -c quit
+Ggswin32c -dbatch -dNOPAUSE -sDEVICE=pngalpha -dEPSCrop ``-dBackgroundColor=16#ffffff'' -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -r110x110 -sOutputFile=%%3 -q zz%%4.ps -c quit
 Gif exist zz%%4.ps DEL zz%%4.ps >nul
 </gs>
 
+<convert>
+ G.png
+ Gif exist zz%%4.ps DEL zz%%4.ps >nul
+ Gif exist %%3 DEL %%3 >nul
+ Gdvips -E -q -Ppdf -f %%1 -pp %%2 > zz%%4.ps
+ Ggswin32c -sDEVICE=pngalpha -sOutputFile=%%3 -r110x110 -dEPSCrop -dBackgroundColor=16#ffffff -dTextAlphaBits=2 -dGraphicsAlphaBits=2 -q -dbatch -dNOPAUSE zz%%4.ps -c quit
+ Gif exist zz%%4.ps DEL zz%%4.ps >nul 
+G.svg
+Gdvisvgm -n -p %%2 -c 1.4,1.4 -s %%1 > %%3 
+G.
+Gif exist zz%%4.ps DEL zz%%4.ps >nul
+Gif exist %%3 DEL %%3 >nul
+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
+Gif exist zz%%4.ps DEL zz%%4.ps >nul   
+</convert>
+ <dvipng>
+G.png
+%echo "dbg: got to dvi to png via (dvipng)"
+Gdvipng -T tight -D 144 -bg Transparent -pp %%2:%%2 %%1 -o %%3
+G.gif
+Gdvipng -T tight -D 144 -bg Transparent -gif -pp %%2:%%2 %%1 -o %%3
+G.svg
+Gdvisvgm -n -p %%2 -c 1.4,1.4 -s %%1 > %%3  
+G.
+Gdvipng -T tight -D 144 -bg Transparent -pp %%2:%%2 %%1 -o %%3
+% 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
+  </dvipng>
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Default scripts, shifted rightward 1 pos
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -236,7 +235,7 @@ lc:\tex4ht\tex4ht.fls
 %
 <javahelp>
 .html move %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
 .jhm java -jar c:\jh2.0\javahelp\bin\jhindexer.jar -db %%0-doc\%%1-jhs %%1*.html
 </javahelp>
 <javahelp1>
@@ -245,7 +244,7 @@ lc:\tex4ht\tex4ht.fls
 
 <emspk>
 .html move %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.html %%1.tmp
+.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.html %%1.tmp
 </emspk>
 
 <jsml>
@@ -255,32 +254,32 @@ lc:\tex4ht\tex4ht.fls
 
 <docbk>
 .xml copy %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
 </docbk>
 
 <xhtml>
 .html move %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
 .xht move %%1.xht %%1.tmp
-.xht java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
 .xml move %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
 </xhtml>
 
 <xhtmml>
 .html move %%1.html %%1.tmp
-.html java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
 .xht move %%1.xht %%1.tmp
-.xht java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
 .xml move %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
 </xhtmml>
  
 <ooxtpipes>
 .4oo move %%0.4oo %%0.tmp
-.4oo java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
+.4oo java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
 .4om move %%1.4om %%1.tmp
-.4om java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
+.4om java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
 </ooxtpipes>
 %
 <validatehtml>
@@ -308,7 +307,7 @@ lc:\tex4ht\tex4ht.fls
 %
 .4ot move  %%1.4ot    sxw-%%0.dir\meta.xml
 .4oy move  %%1.4oy    sxw-%%0.dir\styles.xml
-.4og copy  %%1        sxw-%%0.dir\Pictures\%%1
+.4og copy  %%1        sxw-%%0.dir\Pictures\
 .4od cd    sxw-%%0.dir & zip -r -m  %%0.zip * & cd ..
 % .4od cd    sxw-%%0.dir & 7za a -y  %%0.zip * & cd ..
 .4od move sxw-%%0.dir\%%0.zip %%0.odt
@@ -338,7 +337,7 @@ lc:\tex4ht\tex4ht.fls
 %
 .4ot mv  %%1.4ot    meta.xml
 .4oy mv  %%1.4oy    styles.xml
-.4og cp  --parents %%1        Pictures
+.4og cp   %%1        Pictures\
 %-- sxw --
 .4ox zip  %%0.sxw Pictures
 .4ox zip  %%0.sxw settings.xml
@@ -358,7 +357,8 @@ lc:\tex4ht\tex4ht.fls
 .4od zip  %%0.odt styles.xml
 .4od zip  -r %%0.odt Pictures/*
 %
-%%% end openoffice
+%%% end openoffice                                          %
 </oo-msys>
 %
 % end of file
+