/) {
@@ -281,12 +476,16 @@ foreach $texfile (@texfile) {
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
if (-e $new_name_file) {
+ &repaginate_postscript($new_name_file);
print "PDF output file (see link below)
\n";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
my $pdf_file = $1.'.pdf';
if ($laystyle eq 'album' and $numberofcolumns eq '2') {
- $comma = "psnup -2 -s1.0 $new_name_file";
+ my $papera=$paper;
+ if ($papera eq 'letter') {$papera='';}
+ if ($papera ne '') {$papera='-p'.$papera;}
+ $comma = "psnup $papera -2 -s1.0 $new_name_file";
&busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
@@ -318,26 +517,26 @@ foreach $texfile (@texfile) {
# unlink @garb;
unlink $duefile;
print "Your PDF document";
- if ($advans_role) {
- print "
";
- 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 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);
- $texfile =~ s/\.tex$/aaaaa\.html/;
- $tex_temporary_file = IO::File->new('>'.$texfile);
- print $tex_temporary_file 'LOGFILE'.$body_tex_file.'
'."\n";
- print "
";
- print "The link to ";
- $texfile=~s/\/home\/httpd//;
- print "Your original LaTeX file ";
- print "\n";
- }
+ }
+ if ($advanced_role) {
+ print "
";
+ 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 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);
+ $texfile =~ s/\.tex$/aaaaa\.html/;
+ $tex_temporary_file = IO::File->new('>'.$texfile);
+ print $tex_temporary_file 'LOGFILE'.$body_tex_file.'
'."\n";
+ print "
";
+ print "The link to ";
+ $texfile=~s/\/home\/httpd//;
+ print "Your original LaTeX file ";
+ print "\n";
}
} else {
#LaTeX successfully parsed tex file
@@ -352,17 +551,18 @@ foreach $texfile (@texfile) {
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
if (-e $new_name_file) {
+ &repaginate_postscript($new_name_file);
print "
";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
my $pdf_file = $1.'.pdf';
+ $papera=~s/t/p/;
if ($laystyle eq 'album' and $numberofcolumns eq '2') {
- $comma = "psnup -2 -s1.0 $new_name_file";
+ $comma = "psnup $papera -2 -s1.0 $new_name_file";
&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') {
- $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",
@@ -429,8 +629,8 @@ if ($number_of_files>1) {
$zipfile=~s/\/home\/httpd//;
print "
A ZIP file of all the PDFs.";
}
-if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
-
+if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
+print(&Apache::loncommon::end_page());
my $done;
sub REAPER {
$done=1;
@@ -441,8 +641,9 @@ sub busy_wait_command {
$SIG{CHLD} = \&REAPER;
$done=0;
+ print(" Doing : $command");
my $pid=open(CMD,"$command |");
- if ($adv) {
+ if ($advanced_role) {
&Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
}
while(!$done) {
@@ -452,7 +653,7 @@ sub busy_wait_command {
my $size=(stat($output_file))[7];
$extra_msg=", $size bytes generated";
}
- if ($adv) {
+ if ($advanced_role) {
&Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
$message.$extra_msg);
}
@@ -460,7 +661,129 @@ sub busy_wait_command {
$SIG{CHLD}='IGNORE';
close(CMD);
}
+ print("
End
");
+# Repagninate a postscript file.
+# What we need to do:
+# - Count the number of pages in each student.
+# - Add pages between each student so that each student's output is
+# the maximum number of pages.
+#
+sub repaginate_postscript {
+
+ # We will try to do this in 2 passes through the postscript since
+ # the postscript is potentially large, to do 2 passes, the first pass
+ # must be able to calculate the total number of document pages so that
+ # at the beginning of the second pass we already know how to replace
+ # %%Pages:
+
+ # Figure out
+ # 1. Number of pages in the document
+ # 2. Maximum number of pages in a student
+ # 3. Number of pages in each student.
+
+ my ($postscript_filename) = @_;
+ open(PSFILE, "<$postscript_filename");
+ my $line;
+ my $total_pages; # Total pages in document.
+ my $seen_pages = 0; # There are several %%Pages only the first is useful
+ my $student_number = 0; # Index of student we're working on.
+ my @pages_in_student; # For each student his/her initial page count.
+ my $max_pages = 0; # Pages in 'longest' student.
+ while ($line = ) {
+ my $page_number = 0;
+
+ # Check for total pages (%%Pages:)
+
+ if (($line =~ /^%%Pages:/) && (!$seen_pages)) {
+ my @pageinfo = split(/ /,$line);
+ $total_pages = $pageinfo[1];
+ $seen_pages = 1;
+ }
+ # Check for %%Page: n m $page_number will be the
+ # biggest of these until we see an endofstudent.
+ # Note that minipages generate spurious %Page: 1 1's so
+ # we only are looking for the largest n (n is page number at the
+ # bottom of the page, m the page number within the document.
+ #
+ if ($line =~ /^%%Page:/) {
+ my @pageinfo = split(/ /, $line);
+ if ($page_number < $pageinfo[1]) {
+ $page_number = $pageinfo[1];
+ }
+ }
+ # ENDOFSTUDENTSTAMP - save the page_number, reset and, if necessary
+ # udpate max_pages.
+ #
+ if ($line =~ /ENDOFSTUDENTSTAMP/) {
+ $pages_in_student[$student_number] = $page_number;
+ $student_number++;
+
+ if ($page_number > $max_pages) {
+ $max_pages = $page_number;
+ }
+ $page_number = 0;
+
+ }
+
+ }
+ close(PSFILE);
+
+ # Figure out how many total pages we need to add and adjust the
+ # $total_pages accordingly:
+ #
+ my $add_pages = 0;
+ for (my $i =0; $i < $student_number; $i++) {
+ $add_pages += ($max_pages - $pages_in_student[$i]);
+ }
+ # If we don't need to add any pages, we're done!
+ # You might think that we don't need to do anything if
+ # there are no pages to add, however we still need to at least strip out
+ # the ENDOFSTUDENTSTAMP stamps...as they are not postscript comments!!
+
+ # Now pass 2; we're going to write the new. ps file:
+ # - Modify its first %%Pages: line so that it has the new correct number of
+ # pages
+ # - For each student, insert as many blank pages as needed (and
+ # associated structured comments) to expand a student out to
+ # max_pages pages.
+ # - Remove the ENDOFSTUDENTSTAMP lines.
+ #
+
+ $total_pages += $add_pages;
+ $student_number = 0;
+
+ open(PSFILE, "<$postscript_filename");
+ open(PSOFILE,">$postscript_filename"."repaginating"); # unique if original fname is.
+ $seen_pages = 0; # Reset seen %%Pages flag...
+ while ($line = ) {
+ if (($line =~ /^%%Pages:/) && (!$seen_pages)) {
+ $line = "%%Pages: $total_pages\n";
+ $seen_pages = 1;
+ }
+ if ($line =~ /ENDOFSTUDENTSTAMP/) {
+ $add_pages = ($max_pages - $pages_in_student[$student_number]);
+ $line = "\n";
+ my $last_student_page = $pages_in_student[$student_number];
+ my $last_total_page = $student_number*$max_pages + $last_student_page;
+ while ($add_pages) {
+ $line .= "%Page: $last_student_page $last_total_page\n";
+ my $bop = $last_total_page-1;
+ $line .= "TeXDict begin $last_student_page $bop bop eop end\n";
+ $last_student_page++;
+ $last_total_page++;
+ $add_pages--;
+ }
+ $student_number++;
+ }
+ print PSOFILE ($line);
+ }
+ close(PSOFILE);
+ close(PSFILE);
+
+ rename($postscript_filename."repaginating", $postscript_filename);
+
+}