[LON-CAPA-cvs] cvs: loncom /interface printout.pl
sakharuk
lon-capa-cvs@mail.lon-capa.org
Wed, 04 Aug 2004 18:19:11 -0000
sakharuk Wed Aug 4 14:19:11 2004 EDT
Modified files:
/loncom/interface printout.pl
Log:
Bug 3266 (A4 printing fails to work properly) is fixed. Continue to work on other formats.
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.61 loncom/interface/printout.pl:1.62
--- loncom/interface/printout.pl:1.61 Tue Aug 3 17:18:53 2004
+++ loncom/interface/printout.pl Wed Aug 4 14:19:11 2004
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.61 2004/08/03 21:18:53 albertel Exp $
+# $Id: printout.pl,v 1.62 2004/08/04 18:19:11 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,6 +60,7 @@
my $texfile = $ENV{'cgi.'.$identifier.'.file'};
my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};
my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};
+ my $paper = $ENV{'cgi.'.$identifier.'.paper'};
my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};
my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};
my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};
@@ -68,6 +69,7 @@
my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};
my $backref = $ENV{'cgi.'.$identifier.'backref'};
+
my $adv = $ENV{'request.role.adv'};
my @names_pack=();
@@ -266,7 +268,11 @@
$name_file =~ s/\.tex/\.dvi/;
my $new_name_file = $name_file;
$new_name_file =~ s/\.dvi/\.ps/;
- my $comma = "dvips -Ppdf -G0 -o $new_name_file";
+ my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
+ my $papera=$papers[$paper];
+ if ($papera eq 'letter') {$papera='';}
+ if ($papera ne '') {$papera='-t'.$papera;}
+ my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
@@ -281,10 +287,12 @@
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
- $comma = 'pstops -pletter "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);
+ my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
+ 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");
} else {
$ps_file=$new_name_file;
}
@@ -330,7 +338,11 @@
$name_file =~ s/\.tex/\.dvi/;
my $new_name_file = $name_file;
$new_name_file =~ s/\.dvi/\.ps/;
- my $comma = "dvips -Ppdf -G0 -o $new_name_file";
+ my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
+ my $papera=$papers[$paper];
+ if ($papera eq 'letter') {$papera='';}
+ if ($papera ne '') {$papera='-t'.$papera;}
+ my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
@@ -345,13 +357,28 @@
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
- $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
+ 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)"';
&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 @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>";
+ }
+ close(FFH);
+ }
&busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting PS to PDF",
\%prog_state,$pdf_file);