--- loncom/interface/printout.pl 2006/06/26 21:18:43 1.106
+++ loncom/interface/printout.pl 2006/12/19 10:39:28 1.119
@@ -29,6 +29,7 @@ use lib '/home/httpd/lib/perl';
use LONCAPA::loncgi;
use File::Path;
use File::Basename;
+use File::Copy;
use IO::File;
use Image::Magick;
use Apache::lonhtmlcommon();
@@ -204,13 +205,12 @@ print "ReturnReturn $eps_f"; # Debugging
- system("convert $not_eps $eps_f");
- # check is eps exist in prtspool
- if (not -e $eps_f) {
- # converting an animated gif creates either:
- # anim.gif.eps.0
- # or
- # anim.gif-0.eps
- for (my $i=0;$i<10000;$i++) {
- if (-e $eps_f.'.'.$i) {
- rename($eps_f.'.'.$i, $eps_f);
- last;
- }
- my $anim_eps = $eps_f;
- $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i;
- if (-e $anim_eps) {
- rename($anim_eps, $eps_f);
- last;
+ #
+ # If the file is already an .eps or .ps file,
+ # We really just need to copy it from where it was to prtspool
+ # but with the spaces substituted to _'s.
+ #
+ my ($nsname,$path, $sext) = &fileparse($eps_f, qr/\.(ps|eps)/i);
+ if ($sext =~/ps$/i) {
+ # print "$not_eps is a postscript file. copy to $path\n";
+ &File::Path::mkpath($path,0,0777);
+ #print("Made path: $path");
+ #$not_eps =~ s/^\s+//;
+ #$not_eps =~ s/\s+$//;
+ #$not_eps =~ s/ /\__/g;
+ #print("Copying $not_eps to $eps_f\n");
+ copy("$not_eps", "$eps_f");
+ # print "Copy complete\n";
+ } else {
+
+ $eps_f .= '.eps'; # Just append the eps ext.
+ my $path=$eps_f;
+ $path =~ s/\/([^\/]+)\.eps$//;
+ # print "Final file path: $path "; # Debugging
+ &File::Path::mkpath($path,0,0777);
+ $not_eps =~ s/^\s+//;
+ $not_eps =~ s/\s+$//;
+ $not_eps =~ s/ /\\ /g;
+ if ( exists($done_conversion{$not_eps})) { next; }
+ if ($advanced_role) {
+ my $prettyname=$not_eps;
+ $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
+ $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
+ 'Converting to EPS '.$prettyname);
+ }
+ $done_conversion{$not_eps}=1;
+ # print "Converting $not_eps -> $eps_f"; # Debugging
+ system("convert $not_eps $eps_f");
+ # check is eps exist in prtspool
+ if (not -e $eps_f) {
+ # converting an animated gif creates either:
+ # anim.gif.eps.0
+ # or
+ # anim.gif-0.eps
+ for (my $i=0;$i<10000;$i++) {
+ if (-e $eps_f.'.'.$i) {
+ rename($eps_f.'.'.$i, $eps_f);
+ last;
+ }
+ my $anim_eps = $eps_f;
+ $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i;
+ if (-e $anim_eps) {
+ rename($anim_eps, $eps_f);
+ last;
+ }
}
}
- }
- # imagemagick 6.2.0-6.2.7 fails to properly handle
- # convert anim.gif anim.gif.eps
- # it creates anim.eps instead.
- if (not -e $eps_f) {
- my $eps_f2 = $eps_f;
- $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i;
- if(-e $eps_f2) {
- rename($eps_f2,$eps_f);
+
+ # imagemagick 6.2.0-6.2.7 fails to properly handle
+ # convert anim.gif anim.gif.eps
+ # it creates anim.eps instead.
+ if (not -e $eps_f) {
+ my $eps_f2 = $eps_f;
+ $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i;
+ if(-e $eps_f2) {
+ rename($eps_f2,$eps_f);
+ }
}
}
@@ -506,9 +527,44 @@ foreach $texfile (@texfile) {
\%prog_state, $dvi_file);
}
- &busy_wait_command("$comma $name_file 1>dev/null 2>/dev/null",
+ &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement dvips to repaginate",
\%prog_state, $new_name_file);
+ #
+ # One last little hinky kinky thing.
+ # It's just possible that some fonts could not be maded
+ # at the resolution of the pdf print driver.
+ # In that case a file called missfont.log will have been
+ # created that will contain the commands that were attempted
+ # to create the missing fonts. If we basically
+ # take all the 8000 strings in that file, and
+ # replace them with 600 (the ljfour resolution)
+ # run the commands in that file and redvips,
+ # we'll be able to print the missing glyphs at 600dpi.
+ #
+ # Supposedly it is possible to tune TeX/Metafont to do this
+ # right but I failed to get that to work when following the
+ # docs at the tug site, hence this rather kludgey fix.
+ #
+ # We make the (I think) reasonable assumption that
+ # missing glyphs won't change the pagination and I think
+ # this is true because TeX/dvips will leave a space
+ # instead of these glyphs based on the font metrics
+ # (fancy way to say there will be a blank the size of the missing
+ # glyphs).
+ #
+ my $print_directory = dirname($name_file);
+ my $missfonts_file = $print_directory."/missfont.log";
+ #print("
Missing fonts file is: $missfonts_file");
+ if (-e $missfonts_file) {
+ #print("
Missing fonts file exists\n");
+ &create_missing_fonts($missfonts_file);
+ &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
+ "for $status_statement dvips generated missing fonts",
+ \%prog_state, $new_name_file);
+ }
+
+ #
print "\nPDF output file (see link below)
\n";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
@@ -549,6 +605,8 @@ foreach $texfile (@texfile) {
# unlink @garb;
unlink $duefile;
print "Your PDF document";
+ unlink $missfonts_file;
+
}
if ($advanced_role) {
print "
";
@@ -570,6 +628,7 @@ foreach $texfile (@texfile) {
print "Your original LaTeX file ";
print "\n";
}
+
} else {
#LaTeX successfully parsed tex file
$name_file =~ s/\.tex/\.dvi/;
@@ -582,6 +641,39 @@ foreach $texfile (@texfile) {
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
+ #
+ # One last little hinky kinky thing.
+ # It's just possible that some fonts could not be maded
+ # at the resolution of the pdf print driver.
+ # In that case a file called missfont.log will have been
+ # created that will contain the commands that were attempted
+ # to create the missing fonts. If we basically
+ # take all the 8000 strings in that file, and
+ # replace them with 600 (the ljfour resolution)
+ # run the commands in that file and redvips,
+ # we'll be able to print the missing glyphs at 600dpi.
+ #
+ # Supposedly it is possible to tune TeX/Metafont to do this
+ # right but I failed to get that to work when following the
+ # docs at the tug site, hence this rather kludgey fix.
+ #
+ # We make the (I think) reasonable assumption that
+ # missing glyphs won't change the pagination and I think
+ # this is true because TeX/dvips will leave a space
+ # instead of these glyphs based on the font metrics
+ # (fancy way to say there will be a blank the size of the missing
+ # glyphs).
+ #
+ my $print_directory = dirname($name_file);
+ my $missfonts_file = $print_directory."/missfont.log";
+ #print("
Missing fonts file is: $missfonts_file");
+ if (-e $missfonts_file) {
+ #print("
Missing fonts file exists\n");
+ &create_missing_fonts($missfonts_file);
+ &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
+ "for $status_statement dvips generated missing fonts",
+ \%prog_state, $new_name_file);
+ }
if (-e $new_name_file) {
my $latex_file = $name_file;
$latex_file =~ s/\.dvi/\.tex/;
@@ -610,6 +702,7 @@ foreach $texfile (@texfile) {
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement dvips to repaginate",
\%prog_state, $new_name_file);
+
print "
";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
@@ -667,6 +760,8 @@ foreach $texfile (@texfile) {
print "$link_text - click here to download pdf";
print "\n";
}
+ unlink $missfonts_file;
+
}
} else {
print "LaTeX file $texfile was not created successfully";
@@ -700,7 +795,6 @@ sub busy_wait_command {
$SIG{CHLD} = \&REAPER;
$done=0;
- print("
Doing : $command"); my $pid=open(CMD,"$command |"); if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message); @@ -720,7 +814,6 @@ sub busy_wait_command { $SIG{CHLD}='IGNORE'; close(CMD); } - print("
End
"); # Repagninate # What we need to do: @@ -749,12 +842,11 @@ sub repaginate { 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. my $page_number = 0; &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - "Counting pages for student: ".$student_number+1); + &mt("Counting pages for student: [_1]",1)); while ($line =