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

Diff for /loncom/interface/lonprintout.pm between versions 1.85 and 1.100

version 1.85, 2002/10/29 20:58:50 version 1.100, 2002/12/23 19:11:33
Line 66  sub headerform { Line 66  sub headerform {
 <body bgcolor="FFFFFF">  <body bgcolor="FFFFFF">
 <form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">  <form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
 ENDHEADER  ENDHEADER
     if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {   
     $r->print(<<ENDHEADER1);      if ($ENV{'form.postdata'}=~m|^/res/|) {
    $r->print(<<ENDHEADER1);
 <b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>  <b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
 ENDHEADER1  ENDHEADER1
 }      }
 }  }
   
   
Line 81  sub menu_for_output { Line 82  sub menu_for_output {
     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.'"';}
       $ENV{'form.postdata'} =~ s|http://[^/]+||;
     my $subdir_to_print = $ENV{'form.postdata'};      my $subdir_to_print = $ENV{'form.postdata'};
     $subdir_to_print =~ m/\/([^\/]+)$/;      $subdir_to_print =~ m/\/([^\/]+)$/;
     $subdir_to_print =~ s/$1//;      $subdir_to_print =~ s/\Q$1\E//;
     $r->print(<<ENDMENUOUT1);      $r->print(<<ENDMENUOUT1);
 <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">
Line 92  sub menu_for_output { Line 94  sub menu_for_output {
 <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 107  ENDMENUOUT6 Line 109  ENDMENUOUT6
     }      }
       my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});        my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
       $subdirtoprint =~ s/\/[^\/]+$//;        $subdirtoprint =~ s/\/[^\/]+$//;
       if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {        if ((&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) {
   $r->print(<<ENDMENUOUT4);    $r->print(<<ENDMENUOUT4);
   <input type="radio" name="choice" value="Subdirectory print">  Problems from current subdirectory <b>$subdir_to_print</b><br />    <input type="radio" name="choice" value="Subdirectory print">  Problems from current subdirectory <b>$subdir_to_print</b><br />
 ENDMENUOUT4  ENDMENUOUT4
Line 149  ENDMENUOUT5 Line 151  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="assignment" value="$ENV{'form.assignment'}">
   <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].'"> '."\n".
                     $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'});
     $subdirtoprint =~ s/\/[^\/]+$//;      $subdirtoprint =~ s/\/[^\/]+$//;
     my @list_of_files = ();      my @list_of_files = ();
     if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {  
  $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;  
     } else {  
  $subdirtoprint =~ s/.*(\/res\/)/$1/;  
     }  
     my @content_directory = ();      my @content_directory = ();
     if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {      if ($subdirtoprint =~ m|/home/([^/]+)/public_html|) {
  @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');   #localmachine CSTR space
    my $user=$1;
    my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
    @content_directory = &Apache::lonnet::dirlist($subdirtoprint,
         $domain, $user,'');
     } else {      } else {
  @content_directory = &Apache::lonnet::dirlist($subdirtoprint);   @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
     }      }
Line 213  ENDMENUOUT1 Line 277  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 266  ENDMENUOUT1 Line 331  ENDMENUOUT1
     }      }
 </script>  </script>
 <input type=button onClick="checkall()" value="Check All">&nbsp;  <input type=button onClick="checkall()" value="Check All">&nbsp;
 <input type=button onClick="checksec()" value="Check Section/Group">  <input type=button onClick="checksec()" value="Type Section/Group then click">
 <input type=text size=5 name=chksec>&nbsp;  <input type=text size=5 name=chksec>&nbsp;
 <input type=button onClick="uncheckall()" value="Uncheck">  <input type=button onClick="uncheckall()" value="Uncheck">
 <p>  <p>
Line 294  ENDDISHEADER Line 359  ENDDISHEADER
         }           } 
     }      }
     $r->print(<<ENDMENUOUT2);      $r->print(<<ENDMENUOUT2);
 <br />  <br />Number of blank pages to add: <select name="addedpages"><option selected>0</option>
                                                                 <option>1</option>
                                                                 <option>2</option>
                                                                 <option>3</option>
                                       </select>
   <br /> 
 <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">  <input type="hidden" name="papersize" value="$ENV{'form.papersize'}">
 <input type="hidden" name="numberofstudents" value="$i">  <input type="hidden" name="numberofstudents" value="$i">
 <input type="hidden" name="phase" value="three">  <input type="hidden" name="phase" value="three">
Line 312  sub additional_print_menu { Line 382  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 320  sub additional_print_menu { Line 393  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'}">  <input type="hidden" name="assignment" value="$ENV{'form.assignment'}">
   <input type="hidden" name="addedpages" value="$ENV{'form.addedpages'}">
 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 353  ENDPART Line 428  ENDPART
     my $laystyle = 'book';      my $laystyle = 'book';
     my $assignment =  $ENV{'form.assignment'};      my $assignment =  $ENV{'form.assignment'};
     if ($choice eq 'Subdirectory print') {      if ($choice eq 'Subdirectory print') {
  $layout = 'CAPA';   if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
  $papersize = 'Letter [8 1/2x11 in]';   if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
  $numberofcolumns = 2;   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 (($choice eq 'Standard LaTeX output for current document') &&
  $layout = 'CAPA';   ($ENV{'form.url'}=~m|^/~|)) {
  $papersize = 'Letter [8 1/2x11 in]';   if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';}
  $numberofcolumns = 1;   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
Line 376  ENDPART Line 452  ENDPART
     if ($choice eq 'Standard LaTeX output for current document') {      if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml          #-- single document - problem, page, html, xml  
       $selectionmade = 1;        $selectionmade = 1;
       my %moreenv;        if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
       $moreenv{'form.grade_target'}='tex';          my %moreenv;
       if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {          $moreenv{'form.grade_target'}='tex';
           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','form.counter');          &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);
           }
         } else {
     $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: ';
     if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) {
         $result.=$1;
     } else {
         $result.=$ENV{'form.url'};
     }
     $result.=' \end{document}'
       }        }
     } 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') {
       #-- 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 518  ENDPART Line 590  ENDPART
     }      }
     if ($current_output=~/\\documentclass/) {      if ($current_output=~/\\documentclass/) {
  my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};   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{}{{\\textbf{$fullname} $courseidinfo  - $assignment}}\\begin{document} /;   $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;   my $blanspages = '';
    for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
    $current_output = '\strut\\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 } \\vskip 3mm'.$blanspages.'\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');      &Apache::lonnet::delenv('form.counter');
Line 544  ENDPART Line 618  ENDPART
  $moreenv{'form.grade_target'}='tex';   $moreenv{'form.grade_target'}='tex';
  $moreenv{'form.textwidth'}=$LaTeXwidth;   $moreenv{'form.textwidth'}=$LaTeXwidth;
  &Apache::lonnet::appenv(%moreenv);   &Apache::lonnet::appenv(%moreenv);
  if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {    if ($urlp =~ m|/home/([^/]+)/public_html|) {
     $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/;       $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
  }   }
  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');
Line 653  sub coming_from_hash { Line 727  sub coming_from_hash {
     my $mapid = $hash{'map_pc_'.$mainsequence};      my $mapid = $hash{'map_pc_'.$mainsequence};
     my $mapstart = $hash{'map_start_'.$mainsequence};      my $mapstart = $hash{'map_start_'.$mainsequence};
     my $mapfinish = $hash{'map_finish_'.$mainsequence};      my $mapfinish = $hash{'map_finish_'.$mainsequence};
     my ($presymb) = split(/___/,$symb);      my ($presymb);
       if ($symb) {
    ($presymb)=split(/___/,$symb);
       } else {
    $presymb=$mainsequence;
    $presymb=~s|^/res/||;
       }
     $presymb = $presymb.'___';      $presymb = $presymb.'___';
     my $current_resource = $mapstart;      my $current_resource = $mapstart;
     while ($current_resource ne $mapfinish) {      while ($current_resource ne $mapfinish) {
Line 1108  sub character_chart { Line 1188  sub character_chart {
 sub page_format_transformation {  sub page_format_transformation {
  my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;    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 $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}/;   $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 1162  sub latex_corrections { Line 1242  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 Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;      $result =~ s/(\\end{document})/\\strut\\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*)(\\strut\\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*)\\strut\\newline/$1/g;
 #-- LaTeX corrections       #-- LaTeX corrections     
     my $first_comment = index($result,'<!--',0);      my $first_comment = index($result,'<!--',0);
     while ($first_comment != -1) {      while ($first_comment != -1) {
Line 1173  sub latex_corrections { Line 1253  sub latex_corrections {
  $first_comment = index($result,'<!--',$first_comment);   $first_comment = index($result,'<!--',$first_comment);
     }      }
     $result =~ s/^\s+$//gm; #remove empty lines      $result =~ s/^\s+$//gm; #remove empty lines
     $result =~ s/(\s)+/$1/g; #removes more than one empty space      $result =~ s/(\s)(\s+)/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;      $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
Line 1218  sub handler { Line 1298  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.85  
changed lines
  Added in v.1.100

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