--- loncom/interface/printout.pl 2004/08/05 18:18:15 1.63
+++ loncom/interface/printout.pl 2004/11/13 08:25:41 1.70
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.63 2004/08/05 18:18:15 sakharuk Exp $
+# $Id: printout.pl,v 1.70 2004/11/13 08:25:41 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -86,7 +86,7 @@ END
#do we have figures?
if (-e $figfile) {
my %done_conversion;
- my $temporary_file=IO::File->new($figfile) || die "Couldn't open file for reading: $!\n";
+ my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
my @content_of_file = <$temporary_file>;
close $temporary_file;
my $noteps;
@@ -209,9 +209,8 @@ 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 $temporary_file=IO::File->new($logfilename) || die "Couldn't open file for reading: $!\n";
+ my $logfilename = $texfile; $logfilename =~ s/\.tex$/\.log/;
+ my $temporary_file=IO::File->new($logfilename) || die "Couldn't open log file $logfilename for reading: $!\n";
my @content_of_file = <$temporary_file>;
close $temporary_file;
my $body_log_file = join(' ',@content_of_file);
@@ -227,7 +226,7 @@ foreach $texfile (@texfile) {
if ($whereitbegins!=-1 and $whereitends!=-1) {
print "With very high probability this error occured in ".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)."
";
}
- print "Here are the error messages in the LaTeX log file
";
+ print "Here are the error messages in the LaTeX log file
";
my $sygnal = 0;
for (my $i=0;$i<=$#content_of_file;$i++) {
if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {
@@ -237,16 +236,17 @@ foreach $texfile (@texfile) {
$sygnal = 0;
}
if ($sygnal) {
- print "$content_of_file[$i]
";
+ print "$content_of_file[$i]";
}
}
+ print "\n";
if ($advans_role) {
print "The link to ";
$logfilename=~s/\/home\/httpd//;
print "Your log file ";
print "\n";
#link tooriginal LaTeX file (included according Michael Hamlin desire)
- my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n";
+ my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
my @tex_content_of_file = <$tex_temporary_file>;
close $tex_temporary_file;
my $body_tex_file = join(' ',@tex_content_of_file);
@@ -274,8 +274,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 +292,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",
@@ -327,7 +326,7 @@ foreach $texfile (@texfile) {
print "Your log file ";
print "\n";
#link tooriginal LaTeX file (included according Michael Hamlin desire)
- my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n";
+ my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
my @tex_content_of_file = <$tex_temporary_file>;
close $tex_temporary_file;
my $body_tex_file = join(' ',@tex_content_of_file);
@@ -346,8 +345,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";
@@ -365,24 +363,29 @@ 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') {
- open(FFH,'<',$ps_file) || die "Couldn't open file for reading: $!\n";
+ 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 ps file $ps_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;
+ open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n";
+ print FFHS $addtoPSfile->{$paper}."\n";
while () {
- $i++;
- if ($i==0) {print FFHS '<< /PageSize [595.2 842] >> setpagedevice'."\n";}
print FFHS $_;
}
close(FFH);
@@ -404,7 +407,7 @@ foreach $texfile (@texfile) {
my @garb = ($texlog,$texaux,$texdvi,$texps);
# unlink @garb;
unlink $duefile;
- print "$link_text";
+ print "$link_text - click here to download pdf";
print "\n";
}
}