--- loncom/interface/printout.pl	2004/08/13 17:14:48	1.66
+++ loncom/interface/printout.pl	2004/08/18 18:56:46	1.67
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.66 2004/08/13 17:14:48 sakharuk Exp $
+# $Id: printout.pl,v 1.67 2004/08/18 18:56:46 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -209,8 +209,7 @@ foreach $texfile (@texfile) {
 			     \%prog_state,$dvi_file);
       } #to create index
       #Do we have a latex error in the log file?
-      my $logfilename = $texfile;
-      $logfilename =~ s/\.tex$/\.log/;
+      my $logfilename = $texfile; $logfilename =~ s/\.tex$/\.log/;
       my $temporary_file=IO::File->new($logfilename) || die "Couldn't open file for reading: $!\n";
       my @content_of_file = <$temporary_file>;
       close $temporary_file; 
@@ -274,8 +273,7 @@ foreach $texfile (@texfile) {
 	  $name_file =~ s/\.tex/\.dvi/;
 	  my $new_name_file = $name_file;
 	  $new_name_file =~ s/\.dvi/\.ps/;
-	  my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
-	  my $papera=$papers[$paper];
+	  my $papera=$paper;
 	  if ($papera eq 'letter') {$papera='';}
 	  if ($papera ne '') {$papera='-t'.$papera;}
 	  my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
@@ -293,8 +291,8 @@ 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];
+		  my $papera=$paper;
+                  if ($papera eq 'letter') {$papera='';}
 		  if ($papera ne '') {$papera='-p'.$papera;}
 		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
 		  &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
@@ -346,8 +344,7 @@ foreach $texfile (@texfile) {
 	  $name_file =~ s/\.tex/\.dvi/;
 	  my $new_name_file = $name_file;
 	  $new_name_file =~ s/\.dvi/\.ps/;
-	  my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
-	  my $papera=$papers[$paper];
+	  my $papera=$paper;
 	  if ($papera eq 'letter') {$papera='';}
 	  if ($papera ne '') {$papera='-t'.$papera;}
 	  my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
@@ -373,24 +370,21 @@ foreach $texfile (@texfile) {
 	      } else {
 		  $ps_file=$new_name_file;
 	      }
-	      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')) {
+	      my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice',
+                               'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice',
+                               'executive'=>,'<< /PageSize [540 720] >> setpagedevice',
+                               'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice',
+                               'a3'=>'<< /PageSize [842 1195.02] >> setpagedevice',
+                               'a4'=>'<< /PageSize [595.2 842] >> setpagedevice',
+                               'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice',
+                               'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice',
+			   };
+	      if ($paper ne 'letter') {
 		  open(FFH,'<',$ps_file) || die "Couldn't open file for reading: $!\n";
 		  my $new_ps_file='new'.$ps_file;
 		  open(FFHS,'>',$new_ps_file) || die "Couldn't open file for reading: $!\n";
-		  my $i=-1;
+		  print FFHS $addtoPSfile->{$paper}."\n";
 		  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);