--- loncom/interface/printout.pl 2006/08/03 00:26:39 1.108 +++ loncom/interface/printout.pl 2007/02/22 01:00:13 1.121 @@ -1,6 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # +# $Id: printout.pl,v 1.121 2007/02/22 01:00:13 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,6 +30,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(); @@ -186,9 +188,9 @@ END print "Return to last resource.

"; my $figfile = $texfile; - $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/; + $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/; my $duefile = $texfile; - $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/; + $duefile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.due/; #do we have figures? # print "Figure file: $figfile\n"; if (-e $figfile) { @@ -204,13 +206,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 +528,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 "\n

PDF output file (see link below)

\n"; $new_name_file =~ m/^(.*)\./; my $ps_file = my $tempo_file = $1.'temporar.ps'; @@ -547,8 +604,10 @@ foreach $texfile (@texfile) { $texps =~ s/\.tex/\.ps/; my @garb = ($texaux,$texdvi,$texps); # unlink @garb; - unlink $duefile; + unlink($duefile); print "Your PDF document"; + unlink($missfonts_file); + } if ($advanced_role) { print "

"; @@ -570,6 +629,7 @@ foreach $texfile (@texfile) { print "Your original LaTeX file "; print "\n"; } + } else { #LaTeX successfully parsed tex file $name_file =~ s/\.tex/\.dvi/; @@ -582,6 +642,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 +703,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'; @@ -663,10 +757,12 @@ foreach $texfile (@texfile) { $texps =~ s/\.tex/\.ps/; my @garb = ($texlog,$texaux,$texdvi,$texps); # unlink @garb; - unlink $duefile; + unlink($duefile); print "$link_text - click here to download pdf"; print "\n"; } + unlink($missfonts_file); + } } else { print "LaTeX file $texfile was not created successfully"; @@ -747,12 +843,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 = ) { @@ -771,41 +866,45 @@ sub repaginate { # if ($line =~ /^%%Page:/) { - my @pageinfo = split(/ /, $line); + my @pageinfo = split(/\s+/, $line); if ($page_number < $pageinfo[1]) { $page_number = $pageinfo[1]; + } elsif ($pageinfo[2] ne 1) { + # current page count reset, and it's not because of a + # minipage + # - save the page_number, reset and, if necessary + # update max_pages. + push(@pages_in_student, $page_number); + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, + &mt("Counting pages for student: [_1]", scalar(@pages_in_student))); + if ($page_number > $max_pages) { + $max_pages = $page_number; + } + $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++; - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - "Counting pages for student: ".$student_number+1); - - if ($page_number > $max_pages) { - $max_pages = $page_number; - } - $page_number = 0; - - } } + # file ended so one more student + push(@pages_in_student, $page_number); + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, + &mt("Counting pages for student: [_1]",scalar(@pages_in_student))); + if ($page_number > $max_pages) { + $max_pages = $page_number; + } + $page_number = 0; + close(PSFILE); # If 2 columns, max_pages must go to an even number of columns: - &Apache::lonnet::logthis("Before 2 col adjust max-pages = $max_pages"); if ($num_columns == 2) { if ($max_pages % 2) { $max_pages++; } } - &Apache::lonnet::logthis("after adjust: $max_pages"); # Now rewrite the LaTex file, substituting our \special # with an appropriate number of \newpage directives. @@ -816,7 +915,7 @@ sub repaginate { open(LATEXOUT, ">$outfilename"); - $student_number = 0; # first student... + my $student_number = 0; # Index of student we're working on. &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, "Repaginating student ".$student_number+1); @@ -828,7 +927,6 @@ sub repaginate { # End of student replace with 0 or more newpages. my $addlines = $max_pages - $pages_in_student[$student_number]; - &Apache::lonnet::logthis("student: $pages_in_student[$student_number] add: $addlines"); while($addlines) { print LATEXOUT '\clearpage \strut \clearpage'; @@ -850,3 +948,57 @@ sub repaginate { } +# +# Create missing fonts given a latex missfonts.log file. +# This file will have lines like: +# +# mktexpk --mfmode ljfour --bdpi 8000 --mag 1+0/8000 --dpi 8000 tcrm0500 +# +# We want to execute those lines with the 8000's changed to 600's +# in order to match the resolution of the ljfour printer. +# Of course if some wiseguy has changed the default printer from ljfour +# in the dvips's config.ps file that will break so we'll also +# ensure that --mfmode is ljfour. +# +sub create_missing_fonts { + my ($fontfile, $state) = @_; + + # Open and read in the font file..we'll read it into the array + # font_commands. + # + open(my $font_handle, $fontfile); + my @font_commands = <$font_handle>; + + # make the list contain each command only once + my %uniq; + @font_commands = map { $uniq{$_}++ == 0 ? $_ : () } @font_commands; + + # Now process each command replacing the appropriate 8000's with + # 600's ensuring that font names with 8000's in them are not corrupted. + # and if the --mfmode is not ljfour we turn it into ljfour. + # Then we execute the command. + # + + foreach my $command (@font_commands) { + #print("
Raw command: $command"); + $command =~ s/ 8000/ 600/g; # dpi directives. + $command =~ s/\/8000/\/600/g; # mag directives. + #print("
After dpi replacements: $command"); + + my @cmdarray = split(/ /,$command); + for (my $i =0; $i < scalar(@cmdarray); $i++) { + if ($cmdarray[$i] eq '--mfmode') { + $cmdarray[$i+1] = "ljfour"; + } + } + #print("
before reassembly : (@cmdarray)"); + $command = join(" ", (@cmdarray)); + + #print("
Creating fonts via command: $command"); + &busy_wait_command("$command 1>/dev/null 2>/dev/null", + "Creating missing font", + $state, $command); + + } + +}