tex4ht-1.0.2008_07_05_0937

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

2 files changed, 25 insertions, 22 deletions

diff --git a/Build/source/texk/tex4htk/ht b/Build/source/texk/tex4htk/ht
index 9336545fb4e..0498e529af7 100755
--- a/Build/source/texk/tex4htk/ht
+++ b/Build/source/texk/tex4htk/ht
@@ -1,7 +1,7 @@
 #!/bin/sh
-$1 $2
-$1 $2
-$1 $2
-tex4ht $2
-t4ht $2  $3     # -d~/WWW/temp/ -m644
+        $1 $2
+        $1 $2
+        $1 $2
+        tex4ht $2
+        t4ht $2  $3
 
diff --git a/Build/source/texk/tex4htk/mk4ht b/Build/source/texk/tex4htk/mk4ht
index 796872ece31..67e2070bf7d 100755
--- a/Build/source/texk/tex4htk/mk4ht
+++ b/Build/source/texk/tex4htk/mk4ht
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# mk4ht                                 2007-11-14-18:40 %
-# Copyright (C) 2003--2007               Eitan M. Gurari %
+# mk4ht                                 2008-06-28-19:09 %
+# Copyright (C) 2003--2008               Eitan M. Gurari %
 #                                                        %
 #                                                        %
 # This work may be distributed and/or modified under the %
@@ -24,6 +24,11 @@
 
 use strict;
 $^W=1; # turn warning on
+my $texFile = '';
+if( @ARGV  ){
+  my(@array) = split('\.',@ARGV[1]);
+  $texFile = @array[0];
+}
 my @options = (
  "",     "ht",        "",         "", "", "-cvalidatehtml",
  "ht",   "htlatex",   "latex",    "", "", "-cvalidatehtml",
@@ -106,18 +111,18 @@ my @options = (
  "w", "wcontext", "context", "xhtml,word", " -csymhtf", "",
  "w", "wxelatex",   "xelatex",   "xhtml,word", " -csymhtf", "",
  "w", "wxetex",     "xetex",     "xhtml,word", " -csymhtf", "",
- "jh", "jhlatex",  "latex",  "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhtex",    "tex",    "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhtexi",   "texi",   "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhcontext","context", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhxelatex",  "xelatex",  "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhxetex",    "xetex",    "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh1", "jh1latex",  "latex",  "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1tex",    "tex",    "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1texi",   "texi",   "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1context","context", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1xelatex",  "xelatex",  "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1xetex",    "xetex",    "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
+ "jh", "jhlatex",  "latex",  "html,javahelp,xml,3.2,unicode", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhtex",    "tex",    "html,javahelp,xml,3.2,unicode", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhtexi",   "texi",   "html,javahelp,xml,3.2,unicode", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhcontext","context", "html,javahelp,xml,3.2,unicode", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhxelatex",  "xelatex",  "html,javahelp,xml,3.2,unicode", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhxetex",    "xetex",    "html,javahelp,xml,3.2,unicode", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp -cvalidatehtml",
+ "jh1", "jh1latex",  "latex",  "html,javahelp,xml,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp",
+ "jh1", "jh1tex",    "tex",    "html,javahelp,xml,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp",
+ "jh1", "jh1texi",   "texi",   "html,javahelp,xml,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp",
+ "jh1", "jh1context","context", "html,javahelp,xml,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp",
+ "jh1", "jh1xelatex",  "xelatex",  "html,javahelp,xml,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp",
+ "jh1", "jh1xetex",    "xetex",    "html,javahelp,xml,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d$texFile-doc/ -cjavahelp",
 
 );
 
@@ -211,7 +216,7 @@ print "  clean.htlatex     lg tmp\n";
 
 }
 
-print "mk4ht (2007-11-14-18:40)\n";
+print "mk4ht (2008-06-28-19:09)\n";
 if(  !@ARGV  ){
   print "improper command\n";
   showInstrucions(); exit(1);
@@ -366,8 +371,6 @@ if( $rtrn = system($commando) ){
 } else {
    my $file;
 my $ext;
-my(@array) = split('\.',@ARGV[1]);
-my $texFile = @array[0];
 opendir(DIR,".") ;
 while ($file = readdir(DIR) ){
   if(index($file,$texFile) == 0 ){