--- doc/help/render.texxml.pl	2002/07/16 20:45:05	1.1
+++ doc/help/render.texxml.pl	2004/09/14 22:26:17	1.18
@@ -29,20 +29,29 @@ use strict;
 use Fcntl;
 use POSIX qw(tmpnam);
 
-if ( scalar(@ARGV) < 2 and 0 )
+if ( scalar(@ARGV) < 2 )
 {
     print (<<USAGE);
 Usage: $0 texxml_file_name or
-       perl $0 -- texxml_file_name
-       where "texxml_file_name" does not include the .texxml suffix
+       perl $0 -- texxml_file_name [epssource] [--with-filenames]
+       where "texxml_file_name" optionally includes the extension
 Output: texxml_file_name.dvi
 
 $0 renders texxml files into dvi files by copying the tex file
 resulting from from texxml2latex.pl and the referenced eps files
 into a temporary directory and running LaTeX on the .tex file.
 
+If a second argument is passed, it is used as the location of the 
+.eps files the document uses.
+
 Must be run as somebody with permissions to write temp files and 
 access /home/httpd/html/adm/help/eps.
+
+If thre is a second argument, it will be used as the path to the 
+eps files, otherwise "../../loncom/html/adm/help/eps" is used.
+
+If the optional argument --with-filenames is included then
+the filename for each fragment is stuck into the finished file.
 USAGE
 
     exit();
@@ -50,26 +59,59 @@ USAGE
 
 my $tmpdir = tmpnam();
 my $fileroot = $ARGV[1];
-print $fileroot . "\n";
 
-mkdir $tmpdir;
+if (substr($fileroot, -7) eq ".texxml")
+{
+    $fileroot = substr($fileroot, 0, -7);
+}
+
+my $epssource = "../../loncom/html/adm/help/eps";
+# override eps source, for build on install
+if ( $ARGV[2] && $ARGV[2] ne '--with-filenames') {
+    $epssource = $ARGV[2];
+}
+
+my $include_filenames='';
+if ( $ARGV[2] eq '--with-filenames' || $ARGV[3] eq '--with-filenames') {
+    $include_filenames='--with-filenames';
+}
+
+#my $redir = ">& /dev/null"; # empty this for easier debugging
+my $redir = "~/error_log.txt";
+system("rm -f $redir");
+$redir=">> $redir";
+
+mkdir $tmpdir, 0755;
 
 print "Converting texxml to tex...\n";
-system ( "perl texxml2latex.pl $fileroot.texxml > $tmpdir/$fileroot.tex" );
+if (system ( "perl texxml2latex.pl $fileroot.texxml $include_filenames > $tmpdir/$fileroot.tex" )) {
+    $! = 1;
+    die "Terminated render because texxml2latex failed; see previous error message.";
+};
 
 print "Copying .eps files...\n";
-system ( "cp /home/httpd/html/adm/help/eps/* $tmpdir/" );
+system ( "cp $epssource/* $tmpdir/" );
 
 print "Running Latex...\n";
-system ( "cd $tmpdir; latex $fileroot >& /dev/null; latex $fileroot >& /dev/null; latex $fileroot >& /dev/null; " );
+system ( "cd $tmpdir; echo | latex $fileroot $redir; echo | latex $fileroot $redir; makeindex $fileroot.idx; echo | latex $fileroot\ $redir; " );
 
-print "dvips...\n";
-system ( "cd $tmpdir; dvips -f $fileroot.dvi > $fileroot.ps " );
+print "Running dvips...\n";
+system ( "cd $tmpdir; dvips -Ppdf -G0 -f $fileroot.dvi > $fileroot.ps  " );
 
-print "Copying dvi file...\n";
+print "Copying ps file...\n";
 system ( "cp $tmpdir/$fileroot.ps .");
 
+print "Converting to PDF (may take a bit)...\n";
+system ( "ps2pdf $fileroot.ps $fileroot.pdf" );
+
 print "Clearing temp directory...\n";
 system ( "rm -rf $tmpdir" );
 
-print "$fileroot.ps is ready, if all went well.\n";
+if ( -e $fileroot . ".ps" )
+{
+    print "$fileroot.ps and $fileroot.pdf are ready.\n";
+}
+else
+{
+    print "Generationr of $fileroot.ps failed.\n";
+}