[BACK]Return to printout.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/printout.pl between versions 1.175 and 1.176

version 1.175, 2024/10/21 19:32:10 version 1.176, 2024/11/01 00:08:03
Line 448  foreach $texfile (@texfile) { Line 448  foreach $texfile (@texfile) {
 # Explicitly include a switch for papertype, otherwise dvips will default  # Explicitly include a switch for papertype, otherwise dvips will default
 # to whatever is listed first in config.ps (which in most cases is a4).  # to whatever is listed first in config.ps (which in most cases is a4).
   my $papera;    my $papera;
   unless ($paper eq '') {    unless (($paper eq '') || (($laystyle eq 'album') && ($numberofcolumns eq '1'))) {
       $papera='-t'.$paper;        $papera='-t'.$paper;
   }    }
   my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';    my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';
Line 505  foreach $texfile (@texfile) { Line 505  foreach $texfile (@texfile) {
       $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';
       my $pdf_file = $1.'.pdf';        my $pdf_file = $1.'.pdf';
       $papera=~s/t/p/;        unless ($paper eq '') {
             $papera='-p'.$paper;
         }
 #----  #----
 # The code below uses fixps to make pdf include in sequences work.  # The code below uses fixps to make pdf include in sequences work.
 #  #
Line 567  foreach $texfile (@texfile) { Line 569  foreach $texfile (@texfile) {
   }    }
       }        }
       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";    my $canscale;
     if (open(PIPE,"psnup --version 2>&1 |")) {
         while (<PIPE>) {
     chomp();
     if (/^psnup\s+release\s+(\d+)/) {
         if ($1 < 2) {
     $canscale = 1;
         }
         last;
     }
         }
         close(PIPE);
     }
     if ($canscale) {
         $comma = "psnup $papera -2 -s1.0 $new_name_file";
     } else {
         $comma = "psnup $papera -2 $new_name_file";
     }
   &debug("PSNUP command: $comma");    &debug("PSNUP command: $comma");
   &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",    &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
Removed from v.1.175  
changed lines
  Added in v.1.176

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