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

Diff for /loncom/interface/lonprintout.pm between versions 1.70 and 1.71

version 1.70, 2002/09/18 20:40:32 version 1.71, 2002/09/19 18:33:20
Line 93  ENDMENUOUT1 Line 93  ENDMENUOUT1
     if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {      if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
  $r->print(<<ENDMENUOUT2);   $r->print(<<ENDMENUOUT2);
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from <b>$title_for_sequence</b><br />  <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from <b>$title_for_sequence</b><br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  All problems plus any html/xml files from <b>$title_for_sequence</b><br />  <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  All problems plus any pages or html/xml files from <b>$title_for_sequence</b><br />
 ENDMENUOUT2  ENDMENUOUT2
     }      }
     if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {       if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { 
Line 345  ENDPART Line 345  ENDPART
     my $numberofcolumns = $ENV{'form.numberofcolumns'};                     my $numberofcolumns = $ENV{'form.numberofcolumns'};               
     my $laystyle = 'book';      my $laystyle = 'book';
     my $result = '';      my $result = '';
     my $number_of_columns = 1;      my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my $selectionmade = '';      my $selectionmade = '';
     
     if ($choice eq 'Standard LaTeX output for current document') {      if ($choice eq 'Standard LaTeX output for current document') {
Line 363  ENDPART Line 363  ENDPART
       $result .= $texversion;        $result .= $texversion;
       if ($ENV{'form.url'}=~m/\.page\s*$/) {        if ($ENV{'form.url'}=~m/\.page\s*$/) {
   ($result,$number_of_columns) = &page_cleanup($result);    ($result,$number_of_columns) = &page_cleanup($result);
       } else {  
   $result = &additional_cleanup($result);  
       }        }
     } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or       } elsif ($choice eq 'Standard LaTeX output for the primary sequence' or 
              $choice eq 'Standard LaTeX output for whole primary sequence') {               $choice eq 'Standard LaTeX output for whole primary sequence') {
Line 375  ENDPART Line 373  ENDPART
  my $primary_sequence = '/res/'.$1;       my $primary_sequence = '/res/'.$1;    
  my @master_seq = &coming_from_hash($primary_sequence);   my @master_seq = &coming_from_hash($primary_sequence);
         #-- produce an output string          #-- produce an output string
    my $flag_latex_header_remove = 'NO';
    my $flag_page_in_sequence = 'NO';
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
             my ($urlp,$symb) = split /&&/, $master_seq[$i];              my ($urlp,$symb) = split /&&/, $master_seq[$i];
     if ($choice eq 'Standard LaTeX output for the primary sequence') {      if ($choice eq 'Standard LaTeX output for the primary sequence') {
Line 385  ENDPART Line 385  ENDPART
     &Apache::lonnet::appenv(%moreenv);      &Apache::lonnet::appenv(%moreenv);
     my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));      my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
     &Apache::lonnet::delenv('form.grade_target');      &Apache::lonnet::delenv('form.grade_target');
       if ($flag_latex_header_remove ne 'NO') {
    $texversion = &latex_header_footer_remove($texversion);
       } else {
    $texversion =~ s/\\end{document}//;
       }
     $result .= $texversion;              $result .= $texversion;        
       $flag_latex_header_remove = 'YES';
  }   }
     } elsif ($urlp =~ /\S+/) {      } elsif ($urlp =~ /\S+/) {
  $selectionmade = 3;   $selectionmade = 3;
Line 394  ENDPART Line 400  ENDPART
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));   my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
  &Apache::lonnet::delenv('form.grade_target');   &Apache::lonnet::delenv('form.grade_target');
  $result .= $texversion;       if ($urlp =~ m/\.page/) {
       ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
       if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
       $texversion =~ s/\\end{document}\d*/\\end{document}/;
       $flag_page_in_sequence = 'YES';
    } 
    if ($flag_latex_header_remove ne 'NO') {
       $texversion = &latex_header_footer_remove($texversion);
    } else {
       $texversion =~ s/\\end{document}//;
    }
    $result .= $texversion;         
    $flag_latex_header_remove = 'YES';   
     }      }
  }   }
  $result = &additional_cleanup($result);   if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
    $result .= '\end{document}';
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {      }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
         # where is the main sequence of the course?          # where is the main sequence of the course?
  $selectionmade = 4;   $selectionmade = 4;
Line 612  sub coming_from_hash { Line 631  sub coming_from_hash {
 }  }
   
   
   sub latex_header_footer_remove {
       my $text = shift;
       $text =~ s/\\end{document}//;
       $text =~ s/\\documentclass([^&]*)\\begin{document}//;
       return $text;
   }
   
   
 sub character_chart {  sub character_chart {
     my $result = shift;      my $result = shift;
     $result =~ s/&#0?0?7;//g;      $result =~ s/&#0?0?7;//g;
Line 946  sub additional_cleanup { Line 973  sub additional_cleanup {
     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);
    if ($first_app == -1) {last;}
  substr($result,$first_app,$second_app-$first_app+15) = '\vskip 3 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);
     }      }
Removed from v.1.70  
changed lines
  Added in v.1.71

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