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

Diff for /loncom/interface/printout.pl between versions 1.64 and 1.69

version 1.64, 2004/08/12 17:19:25 version 1.69, 2004/09/09 15:30:49
Line 86  END Line 86  END
   #do we have figures?    #do we have figures?
   if (-e $figfile) {    if (-e $figfile) {
       my %done_conversion;        my %done_conversion;
       my $temporary_file=IO::File->new($figfile) || die "Couldn't open file for reading: $!\n";        my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
       my @content_of_file = <$temporary_file>;        my @content_of_file = <$temporary_file>;
       close $temporary_file;          close $temporary_file;  
       my $noteps;        my $noteps;
Line 209  foreach $texfile (@texfile) { Line 209  foreach $texfile (@texfile) {
      \%prog_state,$dvi_file);       \%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; $logfilename =~ s/\.tex$/\.log/;
       $logfilename =~ s/\.tex$/\.log/;        my $temporary_file=IO::File->new($logfilename) || die "Couldn't open log file $logfilename for reading: $!\n";
       my $temporary_file=IO::File->new($logfilename) || die "Couldn't open file for reading: $!\n";  
       my @content_of_file = <$temporary_file>;        my @content_of_file = <$temporary_file>;
       close $temporary_file;         close $temporary_file; 
       my $body_log_file = join(' ',@content_of_file);        my $body_log_file = join(' ',@content_of_file);
Line 246  foreach $texfile (@texfile) { Line 245  foreach $texfile (@texfile) {
       print "<a href=\"$logfilename\">Your log file </a></big></b>";        print "<a href=\"$logfilename\">Your log file </a></big></b>";
       print "\n";        print "\n";
               #link tooriginal LaTeX file (included according Michael Hamlin desire)                #link tooriginal LaTeX file (included according Michael Hamlin desire)
       my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n";        my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
       my @tex_content_of_file = <$tex_temporary_file>;        my @tex_content_of_file = <$tex_temporary_file>;
       close $tex_temporary_file;         close $tex_temporary_file; 
       my $body_tex_file = join(' ',@tex_content_of_file);        my $body_tex_file = join(' ',@tex_content_of_file);
Line 274  foreach $texfile (@texfile) { Line 273  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 @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');    my $papera=$paper;
   my $papera=$papers[$paper];  
   if ($papera eq 'letter') {$papera='';}    if ($papera eq 'letter') {$papera='';}
   if ($papera ne '') {$papera='-t'.$papera;}    if ($papera ne '') {$papera='-t'.$papera;}
   my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";    my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
Line 293  foreach $texfile (@texfile) { Line 291  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') {
   my @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');    my $papera=$paper;
                   my $papera=$papers[$paper];                    if ($papera eq 'letter') {$papera='';}
   if ($papera ne '') {$papera='-p'.$papera;}    if ($papera ne '') {$papera='-p'.$papera;}
   $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';    $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",
Line 327  foreach $texfile (@texfile) { Line 325  foreach $texfile (@texfile) {
   print "<a href=\"$logfilename\">Your log file </a></big></b>";    print "<a href=\"$logfilename\">Your log file </a></big></b>";
   print "\n";    print "\n";
   #link tooriginal LaTeX file (included according Michael Hamlin desire)    #link tooriginal LaTeX file (included according Michael Hamlin desire)
   my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n";    my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
   my @tex_content_of_file = <$tex_temporary_file>;    my @tex_content_of_file = <$tex_temporary_file>;
   close $tex_temporary_file;     close $tex_temporary_file; 
   my $body_tex_file = join(' ',@tex_content_of_file);    my $body_tex_file = join(' ',@tex_content_of_file);
Line 346  foreach $texfile (@texfile) { Line 344  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 @papers=('letter','legal','tabloid','executive','','a3','a4','a5','');    my $papera=$paper;
   my $papera=$papers[$paper];  
   if ($papera eq 'letter') {$papera='';}    if ($papera eq 'letter') {$papera='';}
   if ($papera ne '') {$papera='-t'.$papera;}    if ($papera ne '') {$papera='-t'.$papera;}
   my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";    my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
Line 365  foreach $texfile (@texfile) { Line 362  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 "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')         my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice',
                or ($paper eq '4') or ($paper eq '5') or ($paper eq '7') or ($paper eq '8')) {                                 'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice',
   open(FFH,'<',$ps_file) || die "Couldn't open file for reading: $!\n";                                 'executive'=>,'<< /PageSize [540 720] >> setpagedevice',
                                  'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice',
                                  'a3'=>'<< /PageSize [842 1195.02] >> setpagedevice',
                                  'a4'=>'<< /PageSize [595.2 842] >> setpagedevice',
                                  'a5'=>'<< /PageSize [421.1 595.2] >> 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";
   my $new_ps_file='new'.$ps_file;    my $new_ps_file='new'.$ps_file;
   open(FFHS,'>',$new_ps_file) || die "Couldn't open file for reading: $!\n";    open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n";
   my $i=-1;    print FFHS $addtoPSfile->{$paper}."\n";
   while (<FFH>) {    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 [794.97 1228.59] >> 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 $_;        print FFHS $_;
   }    }
   close(FFH);    close(FFH);
Line 411  foreach $texfile (@texfile) { Line 406  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</a>";        print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";
       print "\n";        print "\n";
   }    }
       }          }  
Removed from v.1.64  
changed lines
  Added in v.1.69

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