Diff for /loncom/interface/printout.pl between versions 1.147 and 1.149

version 1.147, 2011/02/08 12:53:39 version 1.149, 2011/05/18 11:26:44
Line 44  use LONCAPA::Configuration; Line 44  use LONCAPA::Configuration;
 use strict;  use strict;
   
 my $busy_wait_timeout = 30;   my $busy_wait_timeout = 30; 
   my $pdfs_converted    = 0; # non zero if PDF includes (need to fixps).
   
 my $debugging = 0;  my $debugging = 0;
   
Line 477  foreach $texfile (@texfile) { Line 477  foreach $texfile (@texfile) {
       my $ps_file = my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
       my $pdf_file = $1.'.pdf';        my $pdf_file = $1.'.pdf';
       $papera=~s/t/p/;        $papera=~s/t/p/;
               $comma = "fixps --force $new_name_file";  #----
               &debug("FIXPS command: $comma");  # The code below uses fixps to make pdf include in sequences work.
               &busy_wait_command("$comma 1>$tempo_file  2>/dev/null",  #
                                  "for $status_statement now validating PS",  #              $comma = "fixps --force $new_name_file";
                                  \%prog_state,$tempo_file);  #              &debug("FIXPS command: $comma");
       &busy_wait_command("mv $tempo_file $new_name_file",  #              &busy_wait_command("$comma 1>$tempo_file  2>/dev/null",
  'File move', \%prog_state, $new_name_file);  #                                 "for $status_statement now validating PS",
   #                                 \%prog_state,$tempo_file);
   
   #--- 
   #  The code below uses gs to make pdf includes in sequences work
   
         # Use gs to fix the postscript -> level 1.5 
         # .. if pdfs were included
   
         if ($pdfs_converted > 0) {
     $comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 ";
     &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null",
        "for $status_statement now validating PS",
        \%prog_state, $tempo_file);
     
   #---
     &busy_wait_command("mv $tempo_file $new_name_file",
        'File move', \%prog_state, $new_name_file);
         }
       if ($laystyle eq 'album' and $numberofcolumns eq '2') {        if ($laystyle eq 'album' and $numberofcolumns eq '2') {
   $comma = "psnup $papera -2 -s1.0 $new_name_file";    $comma = "psnup $papera -2 -s1.0 $new_name_file";
   &debug("PSNUP command: $comma");    &debug("PSNUP command: $comma");
Line 933  sub convert_figure { Line 951  sub convert_figure {
   
     &debug("Converting pdf $not_eps to postscript: $eps_f");      &debug("Converting pdf $not_eps to postscript: $eps_f");
     system("pdftops $not_eps $eps_f");      system("pdftops $not_eps $eps_f");
       $pdfs_converted++; # Need to fix ps in last pass.
  } else {   } else {
     system("convert $not_eps $eps_f");      system("convert $not_eps $eps_f");
         if($? and $advanced_role){          if($? and $advanced_role){

Removed from v.1.147  
changed lines
  Added in v.1.149


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