Diff for /loncom/interface/lonprintout.pm between versions 1.77 and 1.82

version 1.77, 2002/10/14 13:57:51 version 1.82, 2002/10/23 17:38:03
Line 203  sub problem_choice_menu { Line 203  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 225  sub additional_class_menu { Line 225  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'}">
 <h1>Mark students which assignments 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(
                    'classlist',                     'classlist',
Line 347  ENDPART Line 347  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';
       if ($choice eq 'Subdirectory print') {
    $layout = 'CAPA';
    $papersize = 'Letter [8 1/2x11 in]';
    $numberofcolumns = 2;
       }
       if (($choice eq 'Standard LaTeX output for current document') && ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./)) {
    $layout = 'CAPA';
    $papersize = 'Letter [8 1/2x11 in]';
    $numberofcolumns = 1;
       }
     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 370  ENDPART Line 380  ENDPART
       $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 475  ENDPART Line 485  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 504  ENDPART Line 517  ENDPART
  $current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;   $current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\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 1009  sub character_chart { Line 1024  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 1053  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 1073  sub page_format_transformation { Line 1088  sub page_format_transformation {
     $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\}\\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 /;
     } else {      } else {
  $text =~ s/\\begin{document}/\\setlength{\\textheight}{$textheight}\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\textheight}{$textheight}\\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 /;
     }      }
  }   }
  return $text;   return $text;
Line 1122  sub latex_corrections { Line 1137  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     

Removed from v.1.77  
changed lines
  Added in v.1.82


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