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

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

version 1.173, 2024/10/16 17:48:08 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",
Line 581  foreach $texfile (@texfile) { Line 600  foreach $texfile (@texfile) {
       } else {        } else {
   $ps_file=$new_name_file;    $ps_file=$new_name_file;
       }        }
       my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice',                my $addtoPSfile={'letter'=>'<< /PageSize [612 792] >> setpagedevice',
                                  'legal'=>'<< /PageSize [612 1008] >> setpagedevice',
                                'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice',                                 'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice',
                                'executive'=>,'<< /PageSize [540 720] >> setpagedevice',                                 'executive'=>,'<< /PageSize [540 720] >> setpagedevice',
                                'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice',                                 'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice',
Line 589  foreach $texfile (@texfile) { Line 609  foreach $texfile (@texfile) {
                                'a4'=>'<< /PageSize [595.2 842] >> setpagedevice',                                 'a4'=>'<< /PageSize [595.2 842] >> setpagedevice',
                                'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice',                                 'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice',
                                'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice',                                 'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice',
    };                                };
       if ($paper ne 'letter') {        open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n";
   open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n";        my $new_ps_file='new'.$ps_file;
   my $new_ps_file='new'.$ps_file;        open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n";
   open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n";        print FFHS $addtoPSfile->{$paper}."\n";
   print FFHS $addtoPSfile->{$paper}."\n";        while (<FFH>) {
   while (<FFH>) {            print FFHS $_;
       print FFHS $_;  
   }  
   close(FFH);  
   close(FFHS);  
   $ps_file=$new_ps_file;    
       }        }
         close(FFH);
         close(FFHS);
         $ps_file=$new_ps_file;  
       &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null",        &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null",
  "for $status_statement now Converting PS to PDF",   "for $status_statement now Converting PS to PDF",
  \%prog_state,$pdf_file);   \%prog_state,$pdf_file);
Removed from v.1.173  
changed lines
  Added in v.1.176

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