Diff for /loncom/interface/printout.pl between versions 1.105 and 1.121

version 1.105, 2006/06/26 10:11:48 version 1.121, 2007/02/22 01:00:13
Line 1 Line 1
 #!/usr/bin/perl  #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.  # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #  #
   # $Id$
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
Line 29  use lib '/home/httpd/lib/perl'; Line 30  use lib '/home/httpd/lib/perl';
 use LONCAPA::loncgi;  use LONCAPA::loncgi;
 use File::Path;  use File::Path;
 use File::Basename;  use File::Basename;
   use File::Copy;
 use IO::File;  use IO::File;
 use Image::Magick;  use Image::Magick;
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
Line 186  END Line 188  END
 print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";  print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
   
   my $figfile = $texfile;    my $figfile = $texfile;
   $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;    $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;
   my $duefile = $texfile;    my $duefile = $texfile;
   $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/;    $duefile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.due/;
   #do we have figures?    #do we have figures?
   # print "Figure file: $figfile\n";    # print "Figure file: $figfile\n";
   if (-e $figfile) {    if (-e $figfile) {
Line 204  print "<a href=\"$backref\"><b>Return</b Line 206  print "<a href=\"$backref\"><b>Return</b
       foreach my $not_eps (@content_of_file) {        foreach my $not_eps (@content_of_file) {
   chomp($not_eps);    chomp($not_eps);
   if ($not_eps ne '') {    if ($not_eps ne '') {
       # print "Converting $not_eps"; # Debugging.         # print "Converting $not_eps"; # Debugging.
               my $status_statement='EPS picture for '.$not_eps;                my $status_statement='EPS picture for '.$not_eps;
       # print "$status_statement\n";        # print "$status_statement\n";
       $not_eps=~s|\/\.\/|\/|g;        $not_eps=~s|\/\.\/|\/|g;
       my $eps_f = $not_eps;        my $eps_f = $not_eps;
       # $eps_f =~ s/\.[^.]*$/\.eps/i;        # $eps_f =~ s/\.[^.]*$/\.eps/i;
       $eps_f .= '.eps'; # Just append the eps ext.  
       if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {        if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
                   $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;                    $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
   $eps_f = '/home/httpd/prtspool/'.$eps_f;    $eps_f = '/home/httpd/prtspool/'.$eps_f;
Line 222  print "<a href=\"$backref\"><b>Return</b Line 223  print "<a href=\"$backref\"><b>Return</b
   $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;    $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;
       }        }
       $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.        $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.
       my $path=$eps_f;        # 
       $path =~ s/\/([^\/]+)\.eps$//;        # If the file is already an .eps or .ps file,
       # print "Final file path: $path "; # Debugging        # We really just need to copy it from where it was to prtspool
       File::Path::mkpath($path,0,0777);        # but with the spaces substituted to _'s.
       $not_eps =~ s/^\s+//;        #
       $not_eps =~ s/\s+$//;        my ($nsname,$path, $sext) = &fileparse($eps_f, qr/\.(ps|eps)/i);
       $not_eps =~ s/ /\\ /g;        if ($sext =~/ps$/i) {
       if ( exists($done_conversion{$not_eps})) { next; }    # print "$not_eps is a postscript file. copy to $path\n";
       if ($advanced_role) {    &File::Path::mkpath($path,0,0777);
   my $prettyname=$not_eps;    #print("Made path: $path");
   $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;    #$not_eps =~ s/^\s+//;
   $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;    #$not_eps =~ s/\s+$//;
   &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,    #$not_eps =~ s/ /\__/g;
  'Converting to EPS '.$prettyname);    #print("Copying $not_eps to $eps_f\n");
       }    copy("$not_eps", "$eps_f"); 
       $done_conversion{$not_eps}=1;    # print "Copy complete\n";
       # print "Converting $not_eps -> $eps_f"; # Debugging        } else {
       system("convert $not_eps $eps_f");        
               # check is eps exist in prtspool    $eps_f .= '.eps'; # Just append the eps ext.
               if (not -e $eps_f) {    my $path=$eps_f;
   # converting an animated gif creates either:    $path =~ s/\/([^\/]+)\.eps$//;
                   # anim.gif.eps.0    # print "Final file path: $path "; # Debugging
                   # or    &File::Path::mkpath($path,0,0777);
                   # anim.gif-0.eps    $not_eps =~ s/^\s+//;
   for (my $i=0;$i<10000;$i++) {    $not_eps =~ s/\s+$//;
       if (-e $eps_f.'.'.$i) {    $not_eps =~ s/ /\\ /g;
   rename($eps_f.'.'.$i, $eps_f);    if ( exists($done_conversion{$not_eps})) { next; }
   last;    if ($advanced_role) {
       }        my $prettyname=$not_eps;
       my $anim_eps = $eps_f;        $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
       $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i;        $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
       if (-e $anim_eps) {        &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
   rename($anim_eps, $eps_f);      'Converting to EPS '.$prettyname);
   last;    }
     $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    # imagemagick 6.2.0-6.2.7 fails to properly handle
               # convert anim.gif anim.gif.eps    # convert anim.gif anim.gif.eps
               # it creates anim.eps instead.     # it creates anim.eps instead. 
               if (not -e $eps_f) {    if (not -e $eps_f) {
   my $eps_f2 = $eps_f;        my $eps_f2 = $eps_f;
   $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i;        $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i;
   if(-e $eps_f2) {        if(-e $eps_f2) {
       rename($eps_f2,$eps_f);    rename($eps_f2,$eps_f);
         }
   }    }
       }        }
   
Line 506  foreach $texfile (@texfile) { Line 528  foreach $texfile (@texfile) {
      \%prog_state, $dvi_file);       \%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",   "for $status_statement dvips to repaginate",
  \%prog_state, $new_name_file);   \%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("<br /> Missing fonts file is: $missfonts_file");
         if (-e $missfonts_file) {
     #print("<br />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<h1>PDF output file (see link below)</h1>\n";        print "\n<h1>PDF output file (see link below)</h1>\n";
       $new_name_file =~ m/^(.*)\./;        $new_name_file =~ m/^(.*)\./;
       my $ps_file = my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
Line 547  foreach $texfile (@texfile) { Line 604  foreach $texfile (@texfile) {
       $texps =~ s/\.tex/\.ps/;        $texps =~ s/\.tex/\.ps/;
       my @garb = ($texaux,$texdvi,$texps);        my @garb = ($texaux,$texdvi,$texps);
 #  unlink @garb;  #  unlink @garb;
       unlink $duefile;        unlink($duefile);
       print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";        print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";
         unlink($missfonts_file);
   
   }    }
   if ($advanced_role) {      if ($advanced_role) {  
       print "<br /><br />";        print "<br /><br />";
Line 570  foreach $texfile (@texfile) { Line 629  foreach $texfile (@texfile) {
       print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";        print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
       print "\n";        print "\n";
   }    }
   
       } else {        } else {
   #LaTeX successfully parsed tex file     #LaTeX successfully parsed tex file 
   $name_file =~ s/\.tex/\.dvi/;    $name_file =~ s/\.tex/\.dvi/;
Line 582  foreach $texfile (@texfile) { Line 642  foreach $texfile (@texfile) {
   &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 now Converting to PS",       "for $status_statement now Converting to PS",
      \%prog_state,$new_name_file);       \%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("<br /> Missing fonts file is: $missfonts_file");
     if (-e $missfonts_file) {
         #print("<br />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) {    if (-e $new_name_file) {
       my $latex_file = $name_file;        my $latex_file = $name_file;
       $latex_file =~ s/\.dvi/\.tex/;        $latex_file =~ s/\.dvi/\.tex/;
Line 610  foreach $texfile (@texfile) { Line 703  foreach $texfile (@texfile) {
       &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",   "for $status_statement dvips to repaginate",
  \%prog_state, $new_name_file);   \%prog_state, $new_name_file);
   
       print "<br />";        print "<br />";
       $new_name_file =~ m/^(.*)\./;        $new_name_file =~ m/^(.*)\./;
       my $ps_file = my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
Line 663  foreach $texfile (@texfile) { Line 757  foreach $texfile (@texfile) {
       $texps =~ s/\.tex/\.ps/;        $texps =~ s/\.tex/\.ps/;
       my @garb = ($texlog,$texaux,$texdvi,$texps);        my @garb = ($texlog,$texaux,$texdvi,$texps);
 #  unlink @garb;  #  unlink @garb;
       unlink $duefile;        unlink($duefile);
       print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";        print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";
       print "\n";        print "\n";
   }    }
     unlink($missfonts_file);
   
       }          }  
   } else {    } else {
       print "LaTeX file $texfile was not created successfully";        print "LaTeX file $texfile was not created successfully";
Line 700  sub busy_wait_command { Line 796  sub busy_wait_command {
           
     $SIG{CHLD} = \&REAPER;      $SIG{CHLD} = \&REAPER;
     $done=0;      $done=0;
     print("<p> Doing : <tt>$command</tt>");  
     my $pid=open(CMD,"$command |");      my $pid=open(CMD,"$command |");
     if ($advanced_role) {      if ($advanced_role) {
  &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);   &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
Line 720  sub busy_wait_command { Line 815  sub busy_wait_command {
     $SIG{CHLD}='IGNORE';      $SIG{CHLD}='IGNORE';
     close(CMD);      close(CMD);
 }  }
     print("<p> End</p>");  
   
 #  Repagninate  #  Repagninate
 #  What we need to do:  #  What we need to do:
Line 749  sub repaginate { Line 843  sub repaginate {
     my $line;      my $line;
     my $total_pages; # Total pages in document.      my $total_pages; # Total pages in document.
     my $seen_pages        = 0; # There are several %%Pages only the first is useful      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 @pages_in_student; # For each student his/her initial page count.
     my $max_pages = 0; # Pages in 'longest' student.      my $max_pages = 0; # Pages in 'longest' student.
     my $page_number = 0;      my $page_number = 0;
     &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,       &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 
   "Counting pages for student: ".$student_number+1);    &mt("Counting pages for student: [_1]",1));
   
     while ($line = <PSFILE>) {      while ($line = <PSFILE>) {
   
Line 773  sub repaginate { Line 866  sub repaginate {
  #   #
   
  if ($line =~ /^%%Page:/) {   if ($line =~ /^%%Page:/) {
     my @pageinfo = split(/ /, $line);      my @pageinfo = split(/\s+/, $line);
     if ($page_number < $pageinfo[1]) {      if ($page_number < $pageinfo[1]) {
  $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);      close(PSFILE);
   
     #  If 2 columns, max_pages must go to an even number of columns:      #  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 ($num_columns == 2) {
  if ($max_pages % 2) {   if ($max_pages % 2) {
     $max_pages++;      $max_pages++;
  }   }
     }      }
     &Apache::lonnet::logthis("after adjust: $max_pages");  
           
     #  Now rewrite the LaTex file, substituting our \special      #  Now rewrite the LaTex file, substituting our \special
     #  with an appropriate number of \newpage directives.      #  with an appropriate number of \newpage directives.
Line 818  sub repaginate { Line 915  sub repaginate {
     open(LATEXOUT, ">$outfilename");      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,       &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 
   "Repaginating student ".$student_number+1);    "Repaginating student ".$student_number+1);
   
Line 830  sub repaginate { Line 927  sub repaginate {
     # End of student replace with 0 or more newpages.      # End of student replace with 0 or more newpages.
           
     my $addlines = $max_pages - $pages_in_student[$student_number];      my $addlines = $max_pages - $pages_in_student[$student_number];
     &Apache::lonnet::logthis("student: $pages_in_student[$student_number] add: $addlines");  
     while($addlines)  {      while($addlines)  {
  print LATEXOUT '\linebreak This page left intentionally blank \pagebreak';   print LATEXOUT '\clearpage \strut \clearpage';
   
  $addlines--;   $addlines--;
     }      }
Line 848  sub repaginate { Line 944  sub repaginate {
   
     close(LATEXIN);      close(LATEXIN);
     close(LATEXOUT);      close(LATEXOUT);
    rename($outfilename, $latex_filename);      rename($outfilename, $latex_filename);
   
 }  }
   
   #
   #   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("<br />Raw command: $command");
    $command =~ s/ 8000/ 600/g;    # dpi directives.
    $command =~ s/\/8000/\/600/g;  # mag directives.
    #print("<br />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("<br /> before reassembly : (@cmdarray)");
    $command = join(" ", (@cmdarray));
   
    #print("<br />Creating fonts via command: $command");
    &busy_wait_command("$command 1>/dev/null 2>/dev/null",
      "Creating missing font",
      $state, $command);
      
       }
   
   }

Removed from v.1.105  
changed lines
  Added in v.1.121


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>