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

Diff for /loncom/interface/printout.pl between versions 1.61.2.1 and 1.66

version 1.61.2.1, 2004/09/09 20:41:04 version 1.66, 2004/08/13 17:14:48
Line 60  END Line 60  END
   my $texfile = $ENV{'cgi.'.$identifier.'.file'};    my $texfile = $ENV{'cgi.'.$identifier.'.file'};
   my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};    my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};
   my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};    my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};
     my $paper = $ENV{'cgi.'.$identifier.'.paper'};
   my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};    my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};
   my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};    my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};
   my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};    my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};
Line 68  END Line 69  END
   my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};    my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};
   my $backref = $ENV{'cgi.'.$identifier.'backref'};    my $backref = $ENV{'cgi.'.$identifier.'backref'};
   
   
   my $adv = $ENV{'request.role.adv'};    my $adv = $ENV{'request.role.adv'};
       
   my @names_pack=();    my @names_pack=();
Line 192  foreach $texfile (@texfile) { Line 194  foreach $texfile (@texfile) {
  "for $status_statement now LaTeXing file",   "for $status_statement now LaTeXing file",
  \%prog_state,$dvi_file);   \%prog_state,$dvi_file);
       if ($tableofcontents eq 'yes') {        if ($tableofcontents eq 'yes') {
   system("latex $name_file 1>/dev/null 2>/dev/null");        &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
    "for $status_statement now LaTeXing file for table of contents",
    \%prog_state,$dvi_file);
       } #to create table of contents        } #to create table of contents
       my $idxname=$name_file;        my $idxname=$name_file;
       $idxname=~s/\.tex$/\.idx/;        $idxname=~s/\.tex$/\.idx/;
       if ($tableofindex eq 'yes') {        if ($tableofindex eq 'yes') {
   system("makeindex $idxname");    &busy_wait_command("makeindex $idxname",
   system("latex $name_file 1>/dev/null 2>/dev/null");       "making index file",
        \%prog_state,$idxname);
     &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
        "for $status_statement now LaTeXing file for index section",
        \%prog_state,$dvi_file);
       } #to create index        } #to create index
       #Do we have a latex error in the log file?        #Do we have a latex error in the log file?
       my $logfilename = $texfile;        my $logfilename = $texfile;
Line 266  foreach $texfile (@texfile) { Line 274  foreach $texfile (@texfile) {
   $name_file =~ s/\.tex/\.dvi/;    $name_file =~ s/\.tex/\.dvi/;
   my $new_name_file = $name_file;    my $new_name_file = $name_file;
   $new_name_file =~ s/\.dvi/\.ps/;    $new_name_file =~ s/\.dvi/\.ps/;
   my $comma = "dvips -Ppdf -G0 -o $new_name_file";    my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
     my $papera=$papers[$paper];
     if ($papera eq 'letter') {$papera='';}
     if ($papera ne '') {$papera='-t'.$papera;}
     my $comma = "dvips $papera -Ppdf -G0 -o $new_name_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 now Converting to PS",       "for $status_statement now Converting to PS",
      \%prog_state,$new_name_file);       \%prog_state,$new_name_file);
Line 281  foreach $texfile (@texfile) { Line 293  foreach $texfile (@texfile) {
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);        \%prog_state,$tempo_file); 
       } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {        } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
   $comma = 'pstops -pletter "2:0+1(0.48w,0)"';    my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
                     my $papera=$papers[$paper];
     if ($papera ne '') {$papera='-p'.$papera;}
     $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
   &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",    &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);        \%prog_state,$tempo_file); 
   
       } else {        } else {
   $ps_file=$new_name_file;    $ps_file=$new_name_file;
       }            }    
Line 330  foreach $texfile (@texfile) { Line 346  foreach $texfile (@texfile) {
   $name_file =~ s/\.tex/\.dvi/;    $name_file =~ s/\.tex/\.dvi/;
   my $new_name_file = $name_file;    my $new_name_file = $name_file;
   $new_name_file =~ s/\.dvi/\.ps/;    $new_name_file =~ s/\.dvi/\.ps/;
   my $comma = "dvips -Ppdf -G0 -o $new_name_file";    my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');
     my $papera=$papers[$paper];
     if ($papera eq 'letter') {$papera='';}
     if ($papera ne '') {$papera='-t'.$papera;}
     my $comma = "dvips $papera -Ppdf -G0 -o $new_name_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 now Converting to PS",       "for $status_statement now Converting to PS",
      \%prog_state,$new_name_file);       \%prog_state,$new_name_file);
Line 345  foreach $texfile (@texfile) { Line 365  foreach $texfile (@texfile) {
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);       \%prog_state,$tempo_file);
       } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {        } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
   $comma = 'pstops -pletter "2:0+1(0.48w,0)"';    $papera=~s/t/p/;
     $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
   &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",    &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);        \%prog_state,$tempo_file); 
       } else {        } else {
   $ps_file=$new_name_file;    $ps_file=$new_name_file;
       }        }
         if (($paper eq '6') or ($paper eq '1') or ($paper eq '2') or ($paper eq '3') 
                  or ($paper eq '4') or ($paper eq '5') or ($paper eq '7') or ($paper eq '8')) {
     open(FFH,'<',$ps_file) || die "Couldn't open file for reading: $!\n";
     my $new_ps_file='new'.$ps_file;
     open(FFHS,'>',$new_ps_file) || die "Couldn't open file for reading: $!\n";
     my $i=-1;
     while (<FFH>) {
         $i++;
         if ($i==0) {
     if ($paper eq '6') {print FFHS '<< /PageSize [595.2 842] >> setpagedevice'."\n";}
     if ($paper eq '1') {print FFHS '<< /PageSize [612 1008] >> setpagedevice'."\n";}
     if ($paper eq '2') {print FFHS '<< /PageSize [792 1224] >> setpagedevice'."\n";}
     if ($paper eq '3') {print FFHS '<< /PageSize [542 722.7] >> setpagedevice'."\n";}
     if ($paper eq '4') {print FFHS '<< /PageSize [1195.02 1690.09] >> setpagedevice'."\n";}
     if ($paper eq '5') {print FFHS '<< /PageSize [842 1195.02] >> setpagedevice'."\n";}
     if ($paper eq '7') {print FFHS '<< /PageSize [421.1 595.2] >> setpagedevice'."\n";}
     if ($paper eq '8') {print FFHS '<< /PageSize [298.75 421.1] >> setpagedevice'."\n";}
         } 
         print FFHS $_;
     }
     close(FFH);
     close(FFHS);
     $ps_file=$new_ps_file;  
         }
       &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",        &busy_wait_command("ps2pdf $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);
Line 367  foreach $texfile (@texfile) { Line 412  foreach $texfile (@texfile) {
       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</a>";
       print "\n";        print "\n";
   }    }
       }        }  
   } else {    } else {
       print "LaTeX file $texfile was not created successfully";        print "LaTeX file $texfile was not created successfully";
   }    }
Removed from v.1.61.2.1  
changed lines
  Added in v.1.66

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