Diff for /loncom/interface/lonprintout.pm between versions 1.78 and 1.89

version 1.78, 2002/10/14 15:20:15 version 1.89, 2002/11/18 14:35:25
Line 77  ENDHEADER1 Line 77  ENDHEADER1
 sub menu_for_output {  sub menu_for_output {
     my $r = shift;      my $r = shift;
     my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu;      my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu;
       my $assignment = $title_for_sequence;
     if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}      if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}
     if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}      if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}
     if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}      if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}
Line 87  sub menu_for_output { Line 88  sub menu_for_output {
 <h1>What do you want to print? Make a choice.</h1><br />  <h1>What do you want to print? Make a choice.</h1><br />
 <input type="hidden" name="phase" value="two">  <input type="hidden" name="phase" value="two">
 <input type="hidden" name="url" value="$ENV{'form.postdata'}">  <input type="hidden" name="url" value="$ENV{'form.postdata'}">
   <input type="hidden" name="assignment" value="$assignment">
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document <b>$title_for_single_resource</b>  <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document <b>$title_for_single_resource</b>
 (prints what you just saw on the screen)<br />  (prints what you just saw on the screen)<br />
 ENDMENUOUT1  ENDMENUOUT1
     if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {      if ($ENV{'form.postdata'}=~/\/res\//) {
  $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">  Problem(s) 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 />  <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  Problem(s) plus page(s) or html/xml file(s) 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\./) and ($ENV{'form.postdata'}=~/\/res\//)) { 
  $r->print(<<ENDMENUOUT6);   $r->print(<<ENDMENUOUT6);
 <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems in this course (<b>warning:</b> this may be time consuming) <br />  <input type="radio" name="choice" value="Standard LaTeX output for the top level sequence">  All problems in this course (<b>warning:</b> this may be time consuming) <br />
 <br />  <br />
Line 147  ENDMENUOUT5 Line 149  ENDMENUOUT5
 }  }
   
   
   sub sequence_content_menu {
       my ($key_to,$r) = @_;
       my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
       my @sequence = split('___',$symbolic);
       my $primary_sequence = '/res/'.$sequence[0];   
       my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
       my @master_seq_view = @master_seq;
       for (my $i=0;$i<=$#master_seq_view;$i++) {
    $master_seq_view[$i]=~/\/([^\/]+)$/;
    $master_seq_view[$i]=$1;
       }
       $r->print(<<ENDMENUOUT1);
   <input type="hidden" name="url" value="$ENV{'form.url'}">
   <input type="hidden" name="choice" value="$ENV{'form.choice'}">
   <input type="hidden" name="layout" value="$ENV{'form.layout'}">
   <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
   <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
   <h1>Mark item(s) which you want to print</h1>
   <script>
       function checkall() {
    for (i=0; i<document.forms.printform.elements.length; i++) {
               if 
             (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
         document.forms.printform.elements[i].checked=true;
               }
           }
       }
       function uncheckall() {
    for (i=0; i<document.forms.printform.elements.length; i++) {
               if 
             (document.forms.printform.elements[i].name.indexOf('whatfile')==0) {
         document.forms.printform.elements[i].checked=false;
               }
           }
       }
   </script>
   <input type=button onClick="checkall()" value="Check All">&nbsp;
   <input type=button onClick="uncheckall()" value="Uncheck">
   <p>
   ENDMENUOUT1
       my $inc=0; 
       for (my $i=0;$i<=$#master_seq_view;$i++) {
         if ($key_to==1 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
    $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '.
                     $master_seq_view[$i]);
           $inc++;
       } elsif ($key_to==0 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) {
    $r->print('<br /><input type=checkbox name="whatfile'.$inc.'" value="'.$master_seq[$i].'"> '.
                     $master_seq_view[$i]);
           $inc++;
         }
       }
       $r->print(<<ENDMENUOUT2);
   <br />
   <input type="hidden" name="numberoffiles" value="$inc">
   <input type="hidden" name="phase" value="three">
   <input type="submit" value="Submit">
   ENDMENUOUT2
   
   }
   
   
 sub problem_choice_menu {  sub problem_choice_menu {
     my $r = shift;      my $r = shift;
     my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});      my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
Line 203  sub problem_choice_menu { Line 267  sub problem_choice_menu {
 <input type=button onClick="uncheckall()" value="Uncheck">  <input type=button onClick="uncheckall()" value="Uncheck">
 <p>  <p>
 ENDMENUOUT1  ENDMENUOUT1
     my $i;      my $i=0;
     foreach my $file (@list_of_files) {      foreach my $file (@list_of_files) {
  $r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.   $r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.
                   $file);                    $file);
Line 211  ENDMENUOUT1 Line 275  ENDMENUOUT1
     }      }
     $r->print(<<ENDMENUOUT2);      $r->print(<<ENDMENUOUT2);
 <br />  <br />
   <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
 <input type="hidden" name="numberofproblems" value="$i">  <input type="hidden" name="numberofproblems" value="$i">
 <input type="hidden" name="phase" value="three">  <input type="hidden" name="phase" value="three">
 <input type="submit" value="Submit">  <input type="submit" value="Submit">
Line 225  sub additional_class_menu { Line 290  sub additional_class_menu {
 <input type="hidden" name="choice" value="$ENV{'form.choice'}">  <input type="hidden" name="choice" value="$ENV{'form.choice'}">
 <input type="hidden" name="layout" value="$ENV{'form.layout'}">  <input type="hidden" name="layout" value="$ENV{'form.layout'}">
 <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">  <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
   <input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
 <h1>Select student(s) whose assignment you want to print</h1>  <h1>Select student(s) whose assignment you want to print</h1>
 ENDMENUOUT1  ENDMENUOUT1
     my %courselist=&Apache::lonnet::dump(      my %courselist=&Apache::lonnet::dump(
Line 309  sub additional_print_menu { Line 375  sub additional_print_menu {
     for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {      for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) {
  $what_to_print .= '<input type="hidden" name="whattoprint'.$i.'" value="'.$ENV{'form.whattoprint'.$i}.'">';   $what_to_print .= '<input type="hidden" name="whattoprint'.$i.'" value="'.$ENV{'form.whattoprint'.$i}.'">';
     }      }
       for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
    $what_to_print .= '<input type="hidden" name="whatfile'.$i.'" value="'.$ENV{'form.whatfile'.$i}.'">';
       }
     $r->print(<<ENDMENUOUT);      $r->print(<<ENDMENUOUT);
     $what_to_print      $what_to_print
 <input type="hidden" name="url" value="$ENV{'form.url'}">  <input type="hidden" name="url" value="$ENV{'form.url'}">
Line 317  sub additional_print_menu { Line 386  sub additional_print_menu {
 <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">  <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
 <input type="hidden" name="numberofstudents" value="$ENV{'form.numberofstudents'}">  <input type="hidden" name="numberofstudents" value="$ENV{'form.numberofstudents'}">
 <input type="hidden" name="numberofproblems" value="$ENV{'form.numberofproblems'}">  <input type="hidden" name="numberofproblems" value="$ENV{'form.numberofproblems'}">
   <input type="hidden" name="numberoffiles" value="$ENV{'form.numberoffiles'}">
 <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">  <input type="hidden" name="numberofcolumns" value="$ENV{'form.numberofcolumns'}">
   <input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
 Define one column layout parameters: <br />  Define one column layout parameters: <br />
 <b>Width</b>: <input type="text" name="width" width="8" value="9cm"> <br />  <b>Width</b>: <input type="text" name="width" width="8" value="9cm"> <br />
 <b>Height</b>: <input type="text" name="height" width="8" value="25.9cm"> <br />  <b>Height</b>: <input type="text" name="height" width="8" value="25.9cm"> <br />
Line 347  ENDPART Line 418  ENDPART
     my $numberofcolumns = $ENV{'form.numberofcolumns'};        my $numberofcolumns = $ENV{'form.numberofcolumns'};  
     my $papersize = $ENV{'form.papersize'};                my $papersize = $ENV{'form.papersize'};          
     my $laystyle = 'book';      my $laystyle = 'book';
       my $assignment =  $ENV{'form.assignment'};
       if ($choice eq 'Subdirectory print') {
    if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
    if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
    if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
       }
       if (($choice eq 'Standard LaTeX output for current document') && ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./)) {
    if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
    if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
    if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;}
       }
     my $result = '';      my $result = '';
     my $number_of_columns = 1; #used only for pages to determine the width of the cell      my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my $selectionmade = '';      my $selectionmade = '';
Line 363  ENDPART Line 445  ENDPART
       $selectionmade = 1;        $selectionmade = 1;
       my %moreenv;        my %moreenv;
       $moreenv{'form.grade_target'}='tex';        $moreenv{'form.grade_target'}='tex';
       if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {        if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) {
   $ENV{'form.url'}=~s/http:\/\/[^\/]+//;    $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
       }        }
       $moreenv{'request.filename'}=$ENV{'form.url'};        $moreenv{'request.filename'}=$ENV{'form.url'};
       $moreenv{'form.textwidth'}=$LaTeXwidth;        $moreenv{'form.textwidth'}=$LaTeXwidth;
       &Apache::lonnet::appenv(%moreenv);        &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});        my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
       &Apache::lonnet::delenv('form.grade_target','form.textwidth');        &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
       $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);
Line 379  ENDPART Line 461  ENDPART
              $choice eq 'Standard LaTeX output for whole primary sequence') {               $choice eq 'Standard LaTeX output for whole primary sequence') {
       #-- minimal sequence to which the current document belongs        #-- minimal sequence to which the current document belongs
         #-- where is the primary sequence containing file?          #-- where is the primary sequence containing file?
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});          my @master_seq = ();
  my @sequence = split('___',$symbolic);   for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
  my $primary_sequence = '/res/'.$sequence[0];         if ($ENV{'form.whatfile'.$i}=~/\S/) {
  my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);   push @master_seq,$ENV{'form.whatfile'.$i};
       }
    }
         #-- produce an output string          #-- produce an output string
  my $flag_latex_header_remove = 'NO';   my $flag_latex_header_remove = 'NO';
  my $flag_page_in_sequence = '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') {
             #prints only problems                $selectionmade = 2;
  $selectionmade = 2;      } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
   if ($urlp =~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {                $selectionmade = 3;
     my %moreenv;  
     $moreenv{'form.grade_target'}='tex';  
     $moreenv{'form.textwidth'}=$LaTeXwidth;  
     &Apache::lonnet::appenv(%moreenv);  
     &Apache::lonnet::logthis("Trying to get $urlp with symb $symb");  
     my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));  
     &Apache::lonnet::delenv('form.grade_target','form.textwidth');  
     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';  
  }  
     } elsif ($urlp =~ /\S+/) {  
               #prints problems, pages and any html/xml files  
  $selectionmade = 3;  
  my %moreenv;  
  $moreenv{'form.grade_target'}='tex';  
  &Apache::lonnet::appenv(%moreenv);  
  my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));  
  &Apache::lonnet::delenv('form.grade_target');  
  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';     
     }      }
      my %moreenv;
      $moreenv{'form.grade_target'}='tex';
      $moreenv{'form.textwidth'}=$LaTeXwidth;
      &Apache::lonnet::appenv(%moreenv);
      &Apache::lonnet::logthis("Trying to get $urlp with symb $symb");
      my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb));
      &Apache::lonnet::delenv('form.grade_target','form.textwidth');
      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';   
  }   }
  &Apache::lonnet::delenv('form.counter');   &Apache::lonnet::delenv('form.counter');
  if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}   if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
Line 475  ENDPART Line 543  ENDPART
  my $primary_sequence = '/res/'.$sequence[0];   my $primary_sequence = '/res/'.$sequence[0];
  my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);    my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); 
         #loop over students          #loop over students
  my $flag_latex_header_remove = 'NO';     my $flag_latex_header_remove = 'NO'; 
    my %moreenv;
    $moreenv{'form.textwidth'}=$LaTeXwidth;
    &Apache::lonnet::appenv(%moreenv);
  foreach my $person (@students) {   foreach my $person (@students) {
     my $current_output = '';       my $current_output = ''; 
     my ($usersection,$username,$userdomain) = split /:/,$person;      my ($usersection,$username,$userdomain) = split /:/,$person;
Line 499  ENDPART Line 570  ENDPART
  }   }
     }      }
     if ($current_output=~/\\documentclass/) {      if ($current_output=~/\\documentclass/) {
  $current_output =~ s/\\begin{document}/\\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$fullname}}\\hskip 1\.4in } \\vskip 5 mm /;   my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
    $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\pagestyle{myheadings}\\markboth{}{{$courseidinfo  - $assignment}}\\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /;
     } else {      } else {
  $current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;   $current_output = '\\vskip 3mm\\clearpage\\strut\\clearpage\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\textit{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
     }      }
     $result .= $current_output;      $result .= $current_output;
       &Apache::lonnet::delenv('form.counter');
  }   }
  $result .= '\end{document}';    $result .= '\end{document}';
    &Apache::lonnet::delenv('form.textwidth');
     } elsif ($choice eq 'Subdirectory print') {            } elsif ($choice eq 'Subdirectory print') {      
     #prints selected problems from the subdirectory       #prints selected problems from the subdirectory 
  $selectionmade = 6;   $selectionmade = 6;
Line 528  ENDPART Line 602  ENDPART
  }   }
  my $texversion=&Apache::lonnet::ssi($urlp);   my $texversion=&Apache::lonnet::ssi($urlp);
  &Apache::lonnet::delenv('form.grade_target','form.textwidth');   &Apache::lonnet::delenv('form.grade_target','form.textwidth');
  $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;                  #this chunck is responsible for printing the path to problem
    my $newurlp = '';
    my $HowMany = length($urlp)*2;
    if ($HowMany > $LaTeXwidth) {
       my @temporrary = split '/',$urlp;
       my $HowManyNew = 0;
       for (my $ii=0;$ii<=$#temporrary;$ii++) {
    if ($temporrary[$ii] ne '') {
       $HowManyNew += length($temporrary[$ii])*2;
       if ($HowManyNew < $LaTeXwidth ) {
    $newurlp .=  '/'.$temporrary[$ii];
       } else {
    $HowManyNew = 0;
    $newurlp .=  '|\vskip -1 mm \noindent \verb|';
    $ii--;
       }
    }
       }
    }
    $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/;
  if ($flag_latex_header_remove ne 'NO') {   if ($flag_latex_header_remove ne 'NO') {
     $texversion = &latex_header_footer_remove($texversion);      $texversion = &latex_header_footer_remove($texversion);
  } else {   } else {
Line 541  ENDPART Line 634  ENDPART
  $result .= '\end{document}';         $result .= '\end{document}';      
     }      }
 #-------------------------------------------------------- corrections for the different page formats  #-------------------------------------------------------- corrections for the different page formats
     $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result);      $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result,$assignment);
     if ($layout eq 'CBI') {      if ($layout eq 'CBI') {
         $laystyle = 'album';          $laystyle = 'album';
     }      }
Line 1009  sub character_chart { Line 1102  sub character_chart {
     $oddoffset = '-0.57 in';      $oddoffset = '-0.57 in';
     $evenoffset = '-0.57 in';      $evenoffset = '-0.57 in';
  } elsif ($numberofcolumns == 2) {   } elsif ($numberofcolumns == 2) {
     $textwidth = '9 cm';      $textwidth = '93 mm';
     $textheight = '25.9 cm';      $textheight = '25.9 cm';
     $oddoffset = '-0.57 in';      $oddoffset = '-0.57 in';
     $evenoffset = '-0.57 in';      $evenoffset = '-0.57 in';
Line 1038  sub character_chart { Line 1131  sub character_chart {
     $oddoffset = '-0.57 in';      $oddoffset = '-0.57 in';
     $evenoffset = '-0.57 in';      $evenoffset = '-0.57 in';
  } elsif ($numberofcolumns == 2) {   } elsif ($numberofcolumns == 2) {
     $textwidth = '9 cm';      $textwidth = '96 mm';
     $textheight = '2 cm';      $textheight = '2 cm';
     $oddoffset = '-0.57 in';      $oddoffset = '-0.57 in';
     $evenoffset = '-0.57 in';      $evenoffset = '-0.57 in';
Line 1066  sub character_chart { Line 1159  sub character_chart {
   
   
 sub page_format_transformation {  sub page_format_transformation {
  my ($papersize,$layout,$numberofcolumns,$choice,$text) = @_;    my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
  my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);   my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
  my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};   my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
  if ($layout eq 'CBI') {   if ($layout eq 'CBI') {
     $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill  $courseidinfo} \\vskip 5 mm /;      $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill  $courseidinfo} \\vskip 5 mm /;
  } elsif ($layout eq 'CAPA') {   } elsif ($layout eq 'CAPA') {
      if ($choice ne 'All class print') {        if ($choice ne 'All class print') { 
  $text =~ s/\\begin{document}/\\textheight 25\.9cm\\oddsidemargin = -0\.57in\\evensidemargin = -0\.57in\\textwidth= 9cm\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill  $courseidinfo} \\vskip 5 mm /;   $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\markboth{}{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}} $courseidinfo  - $assignment}\\pagestyle{myheadings}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}/;
     } else {      } else {
  $text =~ s/\\begin{document}/\\setlength{\\textheight}{$textheight}\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\textwidth}{$textwidth}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;   $text =~ s/\\begin{document}/\\setlength{\\textheight}{$textheight}\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\textwidth}{$textwidth}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
     }      }
Line 1110  sub details_for_menu { Line 1203  sub details_for_menu {
     if ($name_of_map =~ /^\s*$/) {      if ($name_of_map =~ /^\s*$/) {
       $ENV{'request.course.uri'} =~ m|([^/]+)$|;        $ENV{'request.course.uri'} =~ m|([^/]+)$|;
       $name_of_map = $1;        $name_of_map = $1;
     }      }  
     return ($name_of_resourse,$name_of_sequence,$name_of_map);      return ($name_of_resourse,$name_of_sequence,$name_of_map);
   
 }  }
Line 1122  sub latex_corrections { Line 1215  sub latex_corrections {
   
     $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;      $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
     $result =~ s/\$number_of_columns/$number_of_columns/g;      $result =~ s/\$number_of_columns/$number_of_columns/g;
     $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny \\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright Michigan State University Board of Trustees $1/;      $result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
     $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;      $result =~ s/(\\end{longtable}\s*)(\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
     $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;      $result =~ s/(\\end{longtable}\s*)\\newline/$1/g;
 #-- LaTeX corrections       #-- LaTeX corrections     
Line 1178  sub handler { Line 1271  sub handler {
     }      }
 #-- additional menu for class printing  #-- additional menu for class printing
      if ($ENV{'form.phase'} eq 'two') {       if ($ENV{'form.phase'} eq 'two') {
  if($ENV{'form.choice'} eq 'All class print') {   if($ENV{'form.choice'} eq 'Standard LaTeX output for whole primary sequence') {
        &sequence_content_menu(0,$r);
    } elsif($ENV{'form.choice'} eq 'Standard LaTeX output for the primary sequence') {
        &sequence_content_menu(1,$r);
    } elsif($ENV{'form.choice'} eq 'All class print') {
      &additional_class_menu($r);       &additional_class_menu($r);
  } elsif($ENV{'form.choice'} eq 'Subdirectory print') {   } elsif($ENV{'form.choice'} eq 'Subdirectory print') {
      &problem_choice_menu($r);       &problem_choice_menu($r);

Removed from v.1.78  
changed lines
  Added in v.1.89


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