Changed the way the html version of the refman is produced.

Separated commands to produce the html and the pdf.

1 files changed, 58 insertions, 46 deletions

diff --git a/win/package.tcl b/win/package.tcl
index 2b108c8..c1ef7b1 100644
--- a/win/package.tcl
+++ b/win/package.tcl
@@ -204,88 +204,100 @@ goto endofperl
 }
 
 
-proc DocClean { } {
-  #
-  # Need to get rid of some temporary files.
+proc dochtml { root } {
   #
-  file delete -force log refman.aux refman.idx refman.ind refman.lof
-  file delete -force refman.log refman.out refman.toc texput.log
-  file delete -force idxmake.dvi idxmake.log refman.4ct refman.4dx refman.4ix
-  file delete -force refman.4tc refman.dvi refman.idx refman.ilg refman.ind
-  file delete -force refman.log refman.tmp refman.xref refman.lg refman.idv
-}
-
-if { $todo eq "doc" || $todo eq "" } {
+  # Making of the html version
   #
-  # Make the pdf manual. Run the command
-  # three time to make the crossrefs ok.
-  #
-  puts "Building the documentation..."
-
   set cwd [pwd]
   cd [file join $root doc]
 
   DocClean
-  puts "First pass through pdflatex."
-  if { [catch {exec pdflatex refman.tex 2>log} result] } {
+  puts "First pass through htlatex."
+  if { [catch {exec htlatex refman.tex refman 2>log} result] } {
     puts $result
     exit
   }
-  puts "Running makeindex."
-  if { [catch {exec makeindex -o refman.ind refman.idx 2>log} result] } {
+  puts "Preparing the index."
+  if { [catch {exec tex {\def\filename{{refman}{idx}{4dx}{ind}}} {\input} idxmake.4ht 2>log} result] } {
     puts $result
     exit
   }
-  puts "Second pass through pdflatex."
-  if { [catch {exec pdflatex refman.tex 2>log} result] } {
+  puts "Running makeindex."
+  if { [catch {exec makeindex -o refman.ind refman.4dx 2>log} result] } {
     puts $result
     exit
   }
-  puts "Third pass through pdflatex."
-  if { [catch {exec pdflatex refman.tex 2>log} result] } {
+  puts "Second pass through htlatex."
+  if { [catch {exec htlatex refman.tex refman 2>log} result] } {
     puts $result
     exit
   }
+
+  cd $cwd
+}
+
+proc docpdf { root } {
+  #
+  # Making of the pdf version
+  #
+  set cwd [pwd]
+  cd [file join $root doc]
+
   DocClean
-  puts "First pass through latex."
-  if { [catch {exec latex refman.tex 2>log} result] } {
-    puts $result
-    exit
-  }
-  puts "Preparing the index."
-  if { [catch {exec tex {\def\filename{{refman}{idx}{4dx}{ind}}} {\input} idxmake.4ht 2>log} result] } {
+  puts "First pass through pdflatex."
+  if { [catch {exec pdflatex refman.tex 2>log} result] } {
     puts $result
     exit
   }
   puts "Running makeindex."
-  if { [catch {exec makeindex -o refman.ind refman.4dx 2>log} result] } {
-    puts $result
-    exit
-  }
-  puts "Second pass through latex."
-  if { [catch {exec latex refman.tex 2>log} result] } {
-    puts $result
-    exit
-  }
-  puts "Third pass through latex."
-  if { [catch {exec latex refman.tex 2>log} result] } {
+  if { [catch {exec makeindex -o refman.ind refman.idx 2>log} result] } {
     puts $result
     exit
   }
-  puts "Buiding html."
-  if { [catch {exec tex4ht refman.tex 2>log} result] } {
+  puts "Second pass through pdflatex."
+  if { [catch {exec pdflatex refman.tex 2>log} result] } {
     puts $result
     exit
   }
-  if { [catch {exec t4ht refman.tex 2>log} result] } {
+  puts "Third pass through pdflatex."
+  if { [catch {exec pdflatex refman.tex 2>log} result] } {
     puts $result
     exit
   }
-  DocClean
 
   cd $cwd
 }
 
+proc DocClean { } {
+  #
+  # Need to get rid of some temporary files.
+  #
+  file delete -force log refman.aux refman.idx refman.ind refman.lof
+  file delete -force refman.log refman.out refman.toc texput.log
+  file delete -force idxmake.dvi idxmake.log refman.4ct refman.4dx refman.4ix
+  file delete -force refman.4tc refman.dvi refman.idx refman.ilg refman.ind
+  file delete -force refman.log refman.tmp refman.xref refman.lg refman.idv
+}
+
+if { $todo eq "doc" || $todo eq "" } {
+  #
+  # Make the pdf manual. Run the command
+  # three time to make the crossrefs ok.
+  #
+  puts "Building the documentation..."
+  docpdf $root
+  dochtml $root
+  DocClean
+}
+
+if { $todo eq "docpdf" } {
+  docpdf $root
+}
+
+if { $todo eq "dochtml" } {
+  dochtml $root
+}
+
 if { $todo eq "wrap" || $todo eq "" } {
   #
   # Wrap up the msi package.