tex4ht-1.0.2008_07_05_0937

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

4 files changed, 14 insertions, 165 deletions

diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
index 79a018e47dd..2a9fb6fd411 100644
--- a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.env / .tex4ht (unix)           2008-02-26-09:03 %
+% tex4ht.env / .tex4ht (unix)           2008-06-28-21:36 %
 % Copyright (C) 1997--2008        Eitan M. Gurari        %
 %                                                        %
 % This work may be distributed and/or modified under the %
@@ -266,6 +266,8 @@ S*
 </oo>
 %
 <javahelp>
+.html mv %%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 echo "java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html"
 .jhm echo "--- Warning ---  Beware of leftover %%1*.html files from other compilations"
 .jhm java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html
diff --git a/Master/texmf-dist/tex4ht/base/unix/xv4ht.cat b/Master/texmf-dist/tex4ht/base/unix/xv4ht.cat
deleted file mode 100644
index b0203e0ffe5..00000000000
--- a/Master/texmf-dist/tex4ht/base/unix/xv4ht.cat
+++ /dev/null
@@ -1,15 +0,0 @@
-"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
-   "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd 
-"-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd 
-"-//W3C//DTD HTML 4.01 Frameset//EN"
-   "http://www.w3.org/TR/html4/frameset.dtd 
-
-
-
-
-"-//OASIS//DTD DocBook XML V4.2CR1//EN"
-   "http://www.oasis-open.org/docbook/xml/4.2CR1/docbookx.dtd 
-
-
-
diff --git a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
index 9c97cbae6c2..0407bda21a9 100644
--- a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% tex4ht.env (ms win)                   2008-02-26-09:03 %
+% tex4ht.env (ms win)                   2008-06-28-21:36 %
 % Copyright (C) 1997--2008        Eitan M. Gurari        %
 %                                                        %
 % This work may be distributed and/or modified under the %
@@ -245,13 +245,14 @@ lc:\tex4ht\tex4ht.fls
 %
 <ooxtpipes>
 .4oo move %%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
+.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:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\tex4ht\xtpipes\ -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>
 %%% openoffice                                                     %
+.4oo if exist sxw-%%0.dir rmdir /Q /S sxw-%%0.dir
 .4oo mkdir sxw-%%0.dir
 .4os mkdir sxw-%%0.dir\Pictures
 .4os move  %%1.4os                  sxw-%%0.dir\settings.xml
@@ -267,140 +268,14 @@ 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
-%-- sxw --
-.4ox cd    sxw-%%0.dir\
-.4ox cd    sxw-%%0.dir\META-INF
-.4ox zip   sxw-%%0.dir\%%0.sxw        sxw-%%0.dir\META-INF\*.*
-.4ox cd    ..
-.4ox cd    sxw-%%0.dir\Pictures
-.4ox zip   sxw-%%0.dir\%%0.sxw        sxw-%%0.dir\Pictures
-.4ox cd ..
-.4ox zip -j sxw-%%0.dir\%%0.sxw       sxw-%%0.dir\*
-.4ox cd ..
-%
-.4ox move sxw-%%0.dir\%%0.sxw .
-%
-.4ox del %%1.4ox
-.4ox echo y | del sxw-%%0.dir\Pictures\*.*
-.4ox rd sxw-%%0.dir\Pictures
-.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 /S sxw-%%0.dir
-%-- odt --
-.4od cd    sxw-%%0.dir\
-.4od cd    sxw-%%0.dir\META-INF
-.4od zip   sxw-%%0.dir\%%0.odt        sxw-%%0.dir\META-INF\*.*
-.4od cd    ..
-.4od cd    sxw-%%0.dir\Pictures
-.4od zip   sxw-%%0.dir\%%0.odt        sxw-%%0.dir\Pictures
-.4od cd ..
-.4od zip -j sxw-%%0.dir\%%0.odt       sxw-%%0.dir\*
-.4od cd ..
-%
-.4od move sxw-%%0.dir\%%0.odt .
-%
-.4od del %%1.4od
-.4od echo y | del sxw-%%0.dir\Pictures\*.*
-.4od rd sxw-%%0.dir\Pictures
-.4od echo y | del sxw-%%0.dir\META-INF\*.*
-.4od rd sxw-%%0.dir\META-INF
-.4od echo y | del sxw-%%0.dir\*.*
-.4od rd sxw-%%0.dir
-% if  'echo y | del ...'  does not work try  'del /Q ...'  instead
-%%% end openoffice                                                  %
-</oo>
-%
-% Activate the following non-concurent sub script, if the previous
-% one does not work. That is, interchange <oo> with <oo-alt>
-% and </oo> with </oo-alt>.
-%
-<oo-alt>
-%%% openoffice                                                     %
-.4os mkdir Pictures
-.4os move  %%1.4os settings.xml
-.4oo move  %%0.4oo content.xml
-%
-.4om mkdir %%1
-.4om move  %%1.4om      %%1\content.xml
-.4om copy  settings.xml %%1\settings.xml
-%
-.4of mkdir META-INF
-.4of move  %%1.4of META-INF\manifest.xml
-%
-.4ot move  %%1.4ot    meta.xml
-.4oy move  %%1.4oy    styles.xml
-.4og copy  %%1        Pictures\%%1
-%-- sxw ---
-.4ox zip -m %%0.sxw Pictures
-.4ox zip -m %%0.sxw settings.xml
-.4ox zip -m %%0.sxw content.xml
-.4ox zip -m -r %%0.sxw %%0-m*
-.4ox zip -m -r %%0.sxw META-INF
-.4ox zip -m %%0.sxw meta.xml
-.4ox zip -m %%0.sxw styles.xml
-.4ox zip -m -r %%0.sxw Pictures/*
-%-- odt ---
-.4od zip -m %%0.odt Pictures
-.4od zip -m %%0.odt settings.xml
-.4od zip -m %%0.odt content.xml
-.4od zip -m -r %%0.odt %%0-m*
-.4od zip -m -r %%0.odt META-INF
-.4od zip -m %%0.odt meta.xml
-.4od zip -m %%0.odt styles.xml
-.4od zip -m -r %%0.odt Pictures/*
-%%% end openoffice                                                  %
-</oo-alt>
-<oo-alt-2>
-%%% openoffice                                                     %
-.4os mkdir sxw-%%0.dir
-.4os mkdir Pictures
-.4os move  %%1.4os                  sxw-%%0.dir\settings.xml
-.4os move  %%0.4oo                  sxw-%%0.dir\content.xml
-%
-.4om mkdir %%1
-.4om move  %%1.4om                  %%1\content.xml
-.4om copy  sxw-%%0.dir\settings.xml %%1\settings.xml
-.4om zip  %%0.zip       %%1\*
-.4om del /Q %%1\*
-.4om rmdir %%1
-%
-.4of mkdir META-INF
-.4of move  %%1.4of META-INF\manifest.xml
-%
-.4ot move  %%1.4ot    sxw-%%0.dir\meta.xml
-.4oy move  %%1.4oy    sxw-%%0.dir\styles.xml
-.4og copy  %%1        Pictures\%%1
-%-- sxw --
-.4ox move %%0.zip %%0.sxw
-.4ox zip   %%0.sxw        META-INF\*.*
-.4ox zip   %%0.sxw        Pictures
-.4ox zip -j %%0.sxw       sxw-%%0.dir\*
-%
-.4ox del %%1.4ox
-.4ox del /Q Pictures\*.*
-.4ox rd Pictures
-.4ox del /Q META-INF\*.*
-.4ox rd META-INF
-.4ox del /Q sxw-%%0.dir\*.*
-.4ox rd /S sxw-%%0.dir
-.4ox del /Q *.tmp
-%-- odt --
-.4od move %%0.zip %%0.odt
-.4od zip %%0.odt       META-INF\*.*
-.4od zip %%0.odt       Pictures
-.4od zip -j %%0.odt    sxw-%%0.dir\*
+.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
 %
 .4od del %%1.4od
-.4od del /Q Pictures\*.*
-.4od rd Pictures
-.4od del /Q META-INF\*.*
-.4od rd META-INF
-.4od del /Q sxw-%%0.dir\*.*
-.4od rd sxw-%%0.dir
-.4od del /Q *.tmp
+.4od if exist sxw-%%0.dir rmdir /Q /S sxw-%%0.dir
 %%% end openoffice
-</oo-alt-2>
+</oo>
 %
 % Platforms (e.g.,  cygwin) with cp and mv utilities of
 % http://www.mingw.org/msys.shtml may use the following script.
@@ -446,6 +321,8 @@ lc:\tex4ht\tex4ht.fls
 </oo-msys>
 %
 <javahelp>
+.html move %%1.html %%1.tmp
+.html java -classpath  c:\tex4ht\texmf\tex4ht\bin\tex4ht.jar xtpipes -i c:\tex4ht\texmf\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>
diff --git a/Master/texmf-dist/tex4ht/base/win32/xv4ht.cat b/Master/texmf-dist/tex4ht/base/win32/xv4ht.cat
deleted file mode 100644
index b0203e0ffe5..00000000000
--- a/Master/texmf-dist/tex4ht/base/win32/xv4ht.cat
+++ /dev/null
@@ -1,15 +0,0 @@
-"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
-   "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd 
-"-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd 
-"-//W3C//DTD HTML 4.01 Frameset//EN"
-   "http://www.w3.org/TR/html4/frameset.dtd 
-
-
-
-
-"-//OASIS//DTD DocBook XML V4.2CR1//EN"
-   "http://www.oasis-open.org/docbook/xml/4.2CR1/docbookx.dtd 
-
-
-