--- loncom/interface/printout.pl	2002/09/18 18:42:57	1.21
+++ loncom/interface/printout.pl	2003/06/06 02:24:49	1.27
@@ -57,12 +57,17 @@ use Image::Magick;
   my $body_log_file = join(' ',@content_of_file); 
   if ($body_log_file=~m/!\s+Emergency stop/) {
       #LaTeX failed to parse tex file 
-      print "<h1>LaTeX could not successfully parse your tex file.</h1>";
-      print "<h2>It probably has errors in it.</h2>";
-      print "Here are the error messages in the LaTeX log file</br>";
+      print "<h2>LaTeX could not successfully parse your tex file.</h2>";
+      print "It probably has errors in it.<br />";
+      my $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART';
+      my $whereitends = rindex $body_log_file,'STAMPOFPASSEDRESOURCEEND';
+      if ($whereitbegins!=-1 and $whereitends!=-1) {
+	print "With very high probability this error occured in ".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)."<br /><br />";
+      }
+      print "Here are the error messages in the LaTeX log file</br><br />";
       my $sygnal = 0;
       for (my $i=0;$i<=$#content_of_file;$i++) {
-	  if ($content_of_file[$i]=~m/^!/) {
+          if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {
 	      $sygnal = 1;
 	  } 
 	  if ($content_of_file[$i]=~m/Here is how much of/) {
@@ -77,23 +82,23 @@ use Image::Magick;
       $name_file =~ s/\.tex/\.dvi/;
       my $new_name_file = $name_file;
       $new_name_file =~ s/\.dvi/\.ps/;
-      my $comma = "dvips -o $new_name_file";
-      system("$comma $name_file");
+      my $comma = "dvips -Ppdf -G0 -o $new_name_file";
+      system("$comma $name_file 1>/dev/null 2>/dev/null");
       if (-e $new_name_file) {
-	  print "<h1>OUTPUT is in the PDF FILE (see link below)</h1>\n";
+	  print "<h1><h1>Successfully created PDF output file (see link below)</h1>\n";
 	  $new_name_file =~ m/^(.*)\./;
 	  my $tempo_file = $1.'temporar.ps';
 	  my $name_file = $1.'.pdf';
-	  if ($laystyle eq 'album') {
+	  if ($laystyle eq 'album' and $numberofcolumns eq '2') {
 	      $comma = "psnup -2 -s1.0 $new_name_file";
-	      system("$comma $tempo_file"); 
-	      system("ps2pdf $tempo_file $name_file");
+	      system("$comma $tempo_file 1>/dev/null 2>/dev/null"); 
+	      system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null");
 	  } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
 	      $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
-	      system("$comma $new_name_file $tempo_file");
-	      system("ps2pdf $tempo_file $name_file");
+	      system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null");
+	      system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null");
 	  } else {
-	      system("ps2pdf $new_name_file $name_file");
+	      system("ps2pdf $new_name_file $name_file 1>/dev/null 2>/dev/null");
 	  }	    
 	  my $texlog = $texfile;
 	  my $texaux = $texfile;
@@ -104,7 +109,7 @@ use Image::Magick;
 	  $texdvi =~ s/\.tex/\.dvi/;
 	  $texps =~ s/\.tex/\.ps/;
 	  my @garb = ($texlog,$texaux,$texdvi,$texps);
-	  unlink @garb;
+#	  unlink @garb;
 	  unlink $duefile;
 	  print "<a href=\"/prtspool/$name_file\">Your PDF document</a>";
 	  print "\n";