--- loncom/interface/printout.pl 2009/04/17 10:02:49 1.141
+++ loncom/interface/printout.pl 2009/09/27 03:13:06 1.142.6.1
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.141 2009/04/17 10:02:49 foxr Exp $
+# $Id: printout.pl,v 1.142.6.1 2009/09/27 03:13:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -467,17 +467,21 @@ foreach $texfile (@texfile) {
my $ps_file = my $tempo_file = $1.'temporar.ps';
my $pdf_file = $1.'.pdf';
$papera=~s/t/p/;
+ $comma = "fixps --force $new_name_file";
+ &debug("FIXPS command: $comma");
+ &busy_wait_command("$comma 1>/dev/null 2>/dev/null",
+ "for $status_statement now validating PS",
+ \%prog_state,$tempo_file);
if ($laystyle eq 'album' and $numberofcolumns eq '2') {
- $comma = "fixps --force ".$new_name_file." | psnup $papera -2 -s1.0 ";
+ $comma = "psnup $papera -2 -s1.0 $new_name_file";
&debug("PSNUP command: $comma");
- &busy_wait_command("$comma 1>$tempo_file 2>/dev/null",
+ &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
- $comma = 'fixps --force '.$new_name_file.' | pstops '.$papera.' "2:0+1(0.48w,0)"';
+ $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file;
&debug("PSTOPS command: $comma ");
-
- &busy_wait_command("$comma 1>$tempo_file 2>/dev/null",
+ &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} else {
@@ -1056,13 +1060,15 @@ sub analyze_logfile {
# $name_file - is the name of the LaTeX file.
# $identifier - is the unique LaTeX identifier.l
- print "
";
+ print '
';
if ($badtext) {
print &mt('There are errors in [_1].',$badtext);
} else {
print &mt('There are errors.');
}
- print "
".&mt('These errors prevent this resource from printing correctly.');
+ print '