--- doc/help/render.texxml.pl	2002/07/18 14:58:03	1.2
+++ doc/help/render.texxml.pl	2003/04/01 04:30:10	1.10
@@ -34,7 +34,7 @@ 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
+       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
@@ -53,6 +53,12 @@ USAGE
 
 my $tmpdir = tmpnam();
 my $fileroot = $ARGV[1];
+
+if (substr($fileroot, -7) eq ".texxml")
+{
+    $fileroot = substr($fileroot, 0, -7);
+}
+
 my $epssource = "/home/httpd/html/adm/help/eps";
 
 if ( defined ( $ARGV[2] ) ) # override eps source, for build on install
@@ -60,7 +66,10 @@ if ( defined ( $ARGV[2] ) ) # override e
     $epssource = $ARGV[2];
 }
 
-mkdir $tmpdir;
+my $redir = ">& /dev/null"; # empty this for easier debugging
+#my $redir = ">> /home/jerf/work/loncapa/doc/help/error_log.txt";
+
+mkdir $tmpdir, 0755;
 
 print "Converting texxml to tex...\n";
 system ( "perl texxml2latex.pl $fileroot.texxml > $tmpdir/$fileroot.tex" );
@@ -69,15 +78,25 @@ print "Copying .eps files...\n";
 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; echo | latex $fileroot\ $redir; " );
 
 print "Running dvips...\n";
-system ( "cd $tmpdir; dvips -f $fileroot.dvi > $fileroot.ps >& /dev/null " );
+system ( "cd $tmpdir; dvips -Ppdf -G0 -f $fileroot.dvi > $fileroot.ps  " );
 
 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";
+}