Diff for /loncom/interface/lonprintout.pm between versions 1.20 and 1.24

version 1.20, 2002/04/01 18:23:12 version 1.24, 2002/04/26 18:19:05
Line 136  ENDPART Line 136  ENDPART
             $_ = $1;              $_ = $1;
             my $urlp = $1;              my $urlp = $1;
     if ($choice eq 'Standard LaTeX output for the primary sequence') {      if ($choice eq 'Standard LaTeX output for the primary sequence') {
  if (/\.problem/) {   if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
     my %moreenv;      my %moreenv;
     $moreenv{'form.grade_target'}='tex';      $moreenv{'form.grade_target'}='tex';
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
     my $texversion=&Apache::lonnet::ssi($urlp);      my $texversion=&Apache::lonnet::ssi($urlp);
     &Apache::lonnet::delenv('form.grade_target');      &Apache::lonnet::delenv('form.grade_target');
     $texversion =~ s!\.gif!\.eps!g;  
     $result .= $texversion;              $result .= $texversion;        
  }   }
     } else {      } else {
Line 150  ENDPART Line 149  ENDPART
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  my $texversion=&Apache::lonnet::ssi($urlp);   my $texversion=&Apache::lonnet::ssi($urlp);
  &Apache::lonnet::delenv('form.grade_target');   &Apache::lonnet::delenv('form.grade_target');
  $texversion =~ s!\.gif!\.eps!g;  
  $result .= $texversion;       $result .= $texversion;    
     }      }
  }   }
Line 192  ENDPART Line 190  ENDPART
     m/\"(.*)\"/;      m/\"(.*)\"/;
             $_ = $1;              $_ = $1;
             my $urlp = $1;              my $urlp = $1;
             if (/\.problem/) {              if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
  my %moreenv;   my %moreenv;
  $moreenv{'form.grade_target'}='tex';   $moreenv{'form.grade_target'}='tex';
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  my $texversion=&Apache::lonnet::ssi($urlp);   my $texversion=&Apache::lonnet::ssi($urlp);
  &Apache::lonnet::delenv('form.grade_target');   &Apache::lonnet::delenv('form.grade_target');
  $texversion =~ s!\.gif!\.eps!;  
  $result .= $texversion;           $result .= $texversion;        
     }      }
  }   }
Line 222  ENDPART Line 219  ENDPART
         m/.*\/(.*)/;          m/.*\/(.*)/;
         $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};          $courseidinfo = $ENV{'course.physnet_'.$1.'.description'};
  $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;   $result =~ s/\\documentclass\[letterpaper\]{article}/\\documentclass\[twocolumn\]{article}/;
  $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;   $result =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 7\.7in\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}}\\hskip 1\.4in $courseidinfo \\vskip 5 mm /;
  $result =~ s/\\includegraphics/\\includegraphics\[width=9\.0 cm\]/g;   $result =~ s/\\includegraphics/\\includegraphics\[width=9\.0 cm\]/g;
  $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.0cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPS $1/;   $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPS $1/;
       }
   #-- LaTeX corrections     
       my $first_comment = index($result,'<!--',0);
       while ($first_comment != -1) {
    my $end_comment = index($result,'-->',$first_comment);
    substr($result,$first_comment,$end_comment-$first_comment+3) = '';
    $first_comment = index($result,'<!--',$first_comment);
     }      }
 #-- LaTeX corrections   
     $result =~ s/^\s+$//gm; #remove empty lines      $result =~ s/^\s+$//gm; #remove empty lines
     $result =~ s/%/\\%/g;   #corrects %      $result =~ s/%/\\%/g;   #corrects %
     $result =~ s/(\s)+/$1/g; #removes more than one empty space      $result =~ s/(\s)+/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*(\\vskip)/ $1/gm;      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
       $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
       $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
       $result =~ s/{\\par }\s*\\\\/\\\\/gm;
    $result =~ s/\\\\\s+\[/ \[/g;
       $result =~ s/&#952;/\$\\theta\$/g; #converts theta from html into tex
   #-- Do all of eps figures exist?
       my $needconvert = 0;
       $_ = $result;
       if (/\\needepsconversion/) { $needconvert = 1; }  
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.tex";      $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.tex";
Line 240  ENDPART Line 252  ENDPART
     }       } 
     print $temp_file $result;      print $temp_file $result;
 $r->print(<<FINALEND);  $r->print(<<FINALEND);
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle">  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$needconvert">
 </body>  </body>
 </html>  </html>
 FINALEND  FINALEND
Line 319  sub handler { Line 331  sub handler {
     unless  ($ENV{'form.phase'}) {      unless  ($ENV{'form.phase'}) {
  &menu_for_output($r);   &menu_for_output($r);
     }      }
   
   
 #-- core part   #-- core part 
     if ($ENV{'form.phase'} eq 'two') {      if ($ENV{'form.phase'} eq 'two') {
  &output_data($r);   &output_data($r);
   
     }      }
     return OK;      return OK;
   

Removed from v.1.20  
changed lines
  Added in v.1.24


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