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

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

version 1.19, 2002/03/21 18:46:15 version 1.20, 2002/04/01 18:23:12
Line 71  sub menu_for_output { Line 71  sub menu_for_output {
 <input type="radio" name="choice" value="Standard LaTeX output for current document">  Current document  <input type="radio" name="choice" value="Standard LaTeX output for current document">  Current document
 (you will print what you see on the screen)<br />  (you will print what you see on the screen)<br />
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />  <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
   <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
 <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />  <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems from the top level sequence<br />
 <br /><hr /><br />  <br /><hr /><br />
 <h1>And what page format do you prefer?</h1>  <h1>And what page format do you prefer?</h1>
Line 117  ENDPART Line 118  ENDPART
       &Apache::lonnet::appenv(%moreenv);        &Apache::lonnet::appenv(%moreenv);
       $result .= $texversion;        $result .= $texversion;
   
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence') {      } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or $choice eq 'Standard LaTeX output for whole primary sequence') {
 #-- where is the primary sequence containing file?  #-- where is the primary sequence containing file?
  my %moreenv;   my %moreenv;
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
Line 134  ENDPART Line 135  ENDPART
     m/\"(.*)\"/;      m/\"(.*)\"/;
             $_ = $1;              $_ = $1;
             my $urlp = $1;              my $urlp = $1;
             if (/\.problem/) {      if ($choice eq 'Standard LaTeX output for the primary sequence') {
  my %moreenv;   if (/\.problem/) {
       my %moreenv;
       $moreenv{'form.grade_target'}='tex';
       &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($urlp);
       &Apache::lonnet::delenv('form.grade_target');
       $texversion =~ s!\.gif!\.eps!g;
       $result .= $texversion;        
    }
       } else {
  $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!;   $texversion =~ s!\.gif!\.eps!g;
  $result .= $texversion;           $result .= $texversion;    
     }      }
  }   }
 #-- additional cleanup for output  #-- additional cleanup for output
Line 150  ENDPART Line 160  ENDPART
  while ($first_app != -1) {   while ($first_app != -1) {
     my $second_app = index($result,'begin{document}',$first_app);      my $second_app = index($result,'begin{document}',$first_app);
     $first_app = rindex($result,'\end{document}',$first_app);      $first_app = rindex($result,'\end{document}',$first_app);
     substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';      substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
     $first_app = index($result,'\documentclass',$first_app+5);      $first_app = index($result,'\documentclass',$first_app+5);
  }   }
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {      }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
Line 198  ENDPART Line 208  ENDPART
  while ($first_app != -1) {   while ($first_app != -1) {
     my $second_app = index($result,'begin{document}',$first_app);      my $second_app = index($result,'begin{document}',$first_app);
     $first_app = rindex($result,'\end{document}',$first_app);      $first_app = rindex($result,'\end{document}',$first_app);
     substr($result,$first_app,$second_app-$first_app+15) = '\vskip 7 mm';      substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 mm';
     $first_app = index($result,'\documentclass',$first_app+5);      $first_app = index($result,'\documentclass',$first_app+5);
  }   }
     }      }
Line 214  ENDPART Line 224  ENDPART
  $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\\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/;
     }      }
 #-- LaTeX corrections   #-- 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*(\\vskip)/ $1/gm;
 #-- writing .tex file in prtspool   #-- writing .tex file in prtspool 
     my $temp_file;      my $temp_file;
     $filename = "/home/httpd/prtspool/$ENV{'environment.firstname'}$ENV{'environment.lastname'}temp$ENV{'user.login.time'}.tex";      $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.tex";
     unless ($temp_file = Apache::File->new('>'.$filename)) {      unless ($temp_file = Apache::File->new('>'.$filename)) {
  $r->log_error("Couldn't open $filename for output $!");   $r->log_error("Couldn't open $filename for output $!");
  return SERVER_ERROR;    return SERVER_ERROR; 
Removed from v.1.19  
changed lines
  Added in v.1.20

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