tex4ht update from latest fix release

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

2 files changed, 108 insertions, 81 deletions

diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
index 4da1d875f66..79a018e47dd 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 / .tex4ht (unix)           2007-05-05-00:26 %
-% Copyright (C) 1997--2007        Eitan M. Gurari        %
+% tex4ht.env / .tex4ht (unix)           2008-02-26-09:03 %
+% Copyright (C) 1997--2008        Eitan M. Gurari        %
 %                                                        %
 % This work may be distributed and/or modified under the %
 % conditions of the LaTeX Project Public License, either %
@@ -226,9 +226,9 @@ S*
  %
 <ooxtpipes>
 .4oo mv %%0.4oo %%0.tmp
-.4oo java -classpath %%~/texmf-dist/tex4ht/bin xtpipes -i %%~/texmf-dist/tex4ht/xttl/ -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 mv %%1.4om %%1.tmp
-.4om java -classpath %%~/texmf-dist/tex4ht/bin xtpipes -i %%~/texmf-dist/tex4ht/xttl/ -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>
 %
 <oo>
@@ -276,18 +276,27 @@ S*
 
 <emspk>
 .html mv %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin xtpipes -i %%~/texmf-dist/tex4ht/xttl/ -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>
 .jsml mv %%1.jsml %%1.tmp
-.jsml java -classpath %%~/texmf-dist/tex4ht/bin xtpipes -i %%~/texmf-dist/tex4ht/xttl/ -o %%1.jsml %%1.tmp
+.jsml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp
 </jsml>
 
 <docbk>
 .xml cp %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin xtpipes -i %%~/texmf-dist/tex4ht/xttl/ -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 mv %%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 mv %%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 mv %%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>
+
 % end of file                                                       %
 
diff --git a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
index c9f9580a4ba..9c97cbae6c2 100644
--- a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.env (ms win)                   2006-12-15-17:47 %
-% Copyright (C) 1997--2006        Eitan M. Gurari        %
+% tex4ht.env (ms win)                   2008-02-26-09:03 %
+% Copyright (C) 1997--2008        Eitan M. Gurari        %
 %                                                        %
 % This work may be distributed and/or modified under the %
 % conditions of the LaTeX Project Public License, either %
@@ -34,12 +34,15 @@
 %     `xxx' of your choice. In the latest case, compile tex4ht.c    %
 %     and t4ht.c with `#define ENVFILE xxx', or provide the address %
 %     of the file to tex4ht and t4ht throught the -e switch         %
+%  4. Under kpathsea, the substring `%%~' may be employed in        %
+%     commands to indirectly obtain the value of ${SELFAUTOPARENT}. %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % * Fix the paths                                                   %
 % * A path may start with:                                          %
 %   ~ for environment variable HOME                                 %
 %   ~~ for environment variable TEX4HTTFM                           %
+%   %%~ for ${SELFAUTOPARENT} of KPATHSEA                           %
 % * A ! requests recursive search into  subdirectories              %
 % * Multiple t and i entries are allowed                            %
 % * When supported by kpathsea                                      %
@@ -48,101 +51,98 @@
 %     represent real addresses                                      %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% Change c:\imagemagick\convert if your path for convert is different.
 %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% 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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\iso8859\1\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\mozilla\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\unicode\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\iso8859\2\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\iso8859\5\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\iso8859\7\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\iso8859\8\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\iso8859\15\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\koi\8r\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\symbol\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\unicode\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\win\1251\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\unicode\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
 </win1251htf>
 
 <unihtf>
-i/tex4ht/ht-fonts/unicode/!
-i/tex4ht/ht-fonts/ascii/!
-i/tex4ht/ht-fonts/alias/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\unicode\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\html-speech\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\unicode\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
+ic:\tex4ht\texmf\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/!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\jsml\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\unicode\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\ascii\!
+ic:\tex4ht\texmf\tex4ht\ht-fonts\alias\!
 </jsmlhtf>
 
 %
@@ -171,13 +171,13 @@ 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
-Gc:\imagemagick\convert -trim +repage -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
+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
-% Gc:\imagemagick\convert -trim -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
-% Gc:\imagemagick\convert -crop 0x0 +repage -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
-% Gc:\imagemagick\convert -crop 0x0 +page -density 110x110 -transparent "#FFFFFF" zz%%4.ps %%3
+% 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
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
 <netpbm>
 Gif exist  zz%%4.ps DEL zz%%4.ps
@@ -201,10 +201,18 @@ 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
-Gc:\imagemagick\convert -crop 0x0 -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3
+Gconvert -crop 0x0 -density 110x110 -transparent '#FFFFFF' zz%%4.ps %%3
 Grm 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
+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>
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Default scripts, shifted rightward 1 pos
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -225,21 +233,21 @@ S*
 <validatehtml>
 </validatehtml>
 <validate>
- .xml java -cp texmf-dist/tex4ht/bin/xv4ht.jar xv4ht %%1.xml texmf-dist/tex4ht/base/win32/xv4ht.cat
- .html java -cp texmf-dist/tex4ht/bin/xv4ht.jar xv4ht %%1.html texmf-dist/tex4ht/base/win32/xv4ht.cat
+ .xml xmllint --noout --valid %%1.xml
+ .html xmllint --noout --valid %%1.html
  .css mycssparser %%1.css
 </validate>
  %
 % * Address for an automatically created bookkeeping file           %
 % * Ignored under kpathsea                                          %
 % * The work directory is assumed for a default                     %
-% lc:\tex4ht\tex4ht.fls
+lc:\tex4ht\tex4ht.fls
 %
 <ooxtpipes>
 .4oo move %%0.4oo %%0.tmp
-.4oo java -classpath  c:\texlive2006\texmf-dist\tex4ht\bin xtpipes -i c:\texlive2006\texmf-dist\tex4ht\xttl\ -o %%0.4oo %%0.tmp
+.4oo java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -o %%0.4oo %%0.tmp
 .4om move %%1.4om %%1.tmp
-.4om java -classpath  c:\texlive2006\texmf-dist\tex4ht\bin xtpipes -i c:\texlive2006\texmf-dist\tex4ht\xttl\ -o %%1.4om %%1.tmp
+.4om java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -o %%1.4om %%1.tmp
 </ooxtpipes>
 %
 <oo>
@@ -278,7 +286,7 @@ S*
 .4ox echo y | del sxw-%%0.dir\META-INF\*.*
 .4ox rd sxw-%%0.dir\META-INF
 .4ox echo y | del sxw-%%0.dir\*.*
-.4ox rd sxw-%%0.dir
+.4ox rd /S sxw-%%0.dir
 %-- odt --
 .4od cd    sxw-%%0.dir\
 .4od cd    sxw-%%0.dir\META-INF
@@ -375,7 +383,7 @@ S*
 .4ox del /Q META-INF\*.*
 .4ox rd META-INF
 .4ox del /Q sxw-%%0.dir\*.*
-.4ox rd sxw-%%0.dir
+.4ox rd /S sxw-%%0.dir
 .4ox del /Q *.tmp
 %-- odt --
 .4od move %%0.zip %%0.odt
@@ -394,7 +402,7 @@ S*
 %%% end openoffice
 </oo-alt-2>
 %
-% Platforms with cp and mv utilities of
+% Platforms (e.g.,  cygwin) with cp and mv utilities of
 % http://www.mingw.org/msys.shtml may use the following script.
 % It is capable of moving pictures from subdirectories required,
 % for instance, by \includegraphics{bitmaps/test.eps}
@@ -446,17 +454,27 @@ S*
 
 <emspk>
 .html move %%1.html %%1.tmp
-.html java -classpath  c:\texlive2006\texmf-dist\tex4ht\bin xtpipes -i c:\texlive2006\texmf-dist\tex4ht\xttl\ -o %%1.html %%1.tmp
+.html java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -o %%1.html %%1.tmp
 </emspk>
 
 <jsml>
 .jsml move %%1.jsml %%1.tmp
-.jsml java -classpath  c:\texlive2006\texmf-dist\tex4ht\bin xtpipes -i c:\texlive2006\texmf-dist\tex4ht\xttl\ -o %%1.jsml %%1.tmp
+.jsml java -classpath c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -o %%1.jsml %%1.tmp
 </jsml>
 
 <docbk>
 .xml copy %%1.xml %%1.tmp
-.xml java -classpath  c:\texlive2006\texmf-dist\tex4ht\bin xtpipes -i c:\texlive2006\texmf-dist\tex4ht\xttl\ -o %%1.xml %%1.tmp
+.xml java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -o %%1.xml %%1.tmp
 </docbk>
 
+<xhtml>
+.html move %%1.html %%1.tmp
+.html java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -s xhtml.4xt -o %%1.html %%1.tmp
+.xht move %%1.xht %%1.tmp
+.xht java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -s xhtml.4xt -o %%1.xht %%1.tmp
+.xml move %%1.xml %%1.tmp
+.xml java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -s xhtml.4xt -o %%1.xml %%1.tmp
+</xhtml>
+
 % end of file                                                       %
+