--- loncom/interface/printout.pl	2004/08/04 18:19:11	1.62
+++ loncom/interface/printout.pl	2004/08/13 17:14:48	1.66
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.62 2004/08/04 18:19:11 sakharuk Exp $
+# $Id: printout.pl,v 1.66 2004/08/13 17:14:48 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -194,13 +194,19 @@ foreach $texfile (@texfile) {
 			 "for $status_statement now LaTeXing file",
 			 \%prog_state,$dvi_file);
       if ($tableofcontents eq 'yes') {
-	  system("latex $name_file 1>/dev/null 2>/dev/null");
+      &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
+			 "for $status_statement now LaTeXing file for table of contents",
+			 \%prog_state,$dvi_file);
       } #to create table of contents
       my $idxname=$name_file;
       $idxname=~s/\.tex$/\.idx/;
       if ($tableofindex eq 'yes') {
-	  system("makeindex $idxname");
-	  system("latex $name_file 1>/dev/null 2>/dev/null");
+	  &busy_wait_command("makeindex $idxname",
+			     "making index file",
+			     \%prog_state,$idxname);
+	  &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
+			     "for $status_statement now LaTeXing file for index section",
+			     \%prog_state,$dvi_file);
       } #to create index
       #Do we have a latex error in the log file?
       my $logfilename = $texfile;
@@ -291,8 +297,10 @@ foreach $texfile (@texfile) {
                   my $papera=$papers[$paper];
 		  if ($papera ne '') {$papera='-p'.$papera;}
 		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
-		  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");
+		  &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
+				     "for $status_statement now Modifying PS layout",
+				     \%prog_state,$tempo_file); 
+
 	      } else {
 		  $ps_file=$new_name_file;
 	      }	    
@@ -357,27 +365,37 @@ foreach $texfile (@texfile) {
 				     "for $status_statement now Modifying PS layout",
 				     \%prog_state,$tempo_file);
 	      } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
-		  my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
-                  my $papera=$papers[$paper];
-		  if ($papera ne '') {$papera='-p'.$papera;}
-		  $comma = 'pstops -pa4 "2:0+1(0.48w,0)"';
+		  $papera=~s/t/p/;
+		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
 		  &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
 				     "for $status_statement now Modifying PS layout",
 				     \%prog_state,$tempo_file); 
 	      } else {
 		  $ps_file=$new_name_file;
 	      }
-	      if ($paper eq '6') {
+	      if (($paper eq '6') or ($paper eq '1') or ($paper eq '2') or ($paper eq '3') 
+               or ($paper eq '4') or ($paper eq '5') or ($paper eq '7') or ($paper eq '8')) {
 		  open(FFH,'<',$ps_file) || die "Couldn't open file for reading: $!\n";
-		  my @content_of_file = <FFH>;
-		  close(FFH);
-		  open(FFH,'>',$ps_file) || die "Couldn't open file for writing: $!\n";
-                  print FFH '<< /PageSize [595.2 842] >> setpagedevice'."\n";
-		  for (my $i=0;$i<=$#content_of_file;$i++) {
-		      print FFH $content_of_file[$i];
-		      print "<br>$i<br>";
+		  my $new_ps_file='new'.$ps_file;
+		  open(FFHS,'>',$new_ps_file) || die "Couldn't open file for reading: $!\n";
+		  my $i=-1;
+		  while (<FFH>) {
+		      $i++;
+		      if ($i==0) {
+			  if ($paper eq '6') {print FFHS '<< /PageSize [595.2 842] >> setpagedevice'."\n";}
+			  if ($paper eq '1') {print FFHS '<< /PageSize [612 1008] >> setpagedevice'."\n";}
+			  if ($paper eq '2') {print FFHS '<< /PageSize [792 1224] >> setpagedevice'."\n";}
+			  if ($paper eq '3') {print FFHS '<< /PageSize [542 722.7] >> setpagedevice'."\n";}
+			  if ($paper eq '4') {print FFHS '<< /PageSize [1195.02 1690.09] >> setpagedevice'."\n";}
+			  if ($paper eq '5') {print FFHS '<< /PageSize [842 1195.02] >> setpagedevice'."\n";}
+			  if ($paper eq '7') {print FFHS '<< /PageSize [421.1 595.2] >> setpagedevice'."\n";}
+			  if ($paper eq '8') {print FFHS '<< /PageSize [298.75 421.1] >> setpagedevice'."\n";}
+		      } 
+		      print FFHS $_;
 		  }
-		  close(FFH);  		  
+		  close(FFH);
+		  close(FFHS);
+		  $ps_file=$new_ps_file;	  
 	      }
 	      &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
 				 "for $status_statement now Converting PS to PDF",
@@ -397,7 +415,7 @@ foreach $texfile (@texfile) {
 	      print "<a href=\"/prtspool/$pdf_file\">$link_text</a>";
 	      print "\n";
 	  }
-      }
+      }  
   } else {
       print "LaTeX file $texfile was not created successfully";
   }