--- loncom/interface/lonprintout.pm	2002/10/07 17:58:47	1.76
+++ loncom/interface/lonprintout.pm	2002/10/23 17:38:03	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.76 2002/10/07 17:58:47 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.82 2002/10/23 17:38:03 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,7 +203,7 @@ sub problem_choice_menu {
 <input type=button onClick="uncheckall()" value="Uncheck">
 <p>
 ENDMENUOUT1
-    my $i;
+    my $i=0;
     foreach my $file (@list_of_files) {
 	$r->print('<br /><input type=checkbox name="whattoprint'.$i.'" value="'.$file.'"> '.
                   $file);
@@ -225,7 +225,7 @@ sub additional_class_menu {
 <input type="hidden" name="choice" value="$ENV{'form.choice'}">
 <input type="hidden" name="layout" value="$ENV{'form.layout'}">
 <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
     my %courselist=&Apache::lonnet::dump(
                    'classlist',
@@ -347,6 +347,16 @@ ENDPART
     my $numberofcolumns = $ENV{'form.numberofcolumns'};  
     my $papersize = $ENV{'form.papersize'};          
     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 $number_of_columns = 1; #used only for pages to determine the width of the cell
     my $selectionmade = '';
@@ -370,7 +380,7 @@ ENDPART
       $moreenv{'form.textwidth'}=$LaTeXwidth;
       &Apache::lonnet::appenv(%moreenv);
       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;
       if ($ENV{'form.url'}=~m/\.page\s*$/) {
 	  ($result,$number_of_columns) = &page_cleanup($result);
@@ -429,7 +439,8 @@ ENDPART
 		$result .= $texversion;         
 		$flag_latex_header_remove = 'YES';   
 	    }
-	}		
+	}
+	&Apache::lonnet::delenv('form.counter');
 	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') {
@@ -474,7 +485,10 @@ ENDPART
 	my $primary_sequence = '/res/'.$sequence[0]; 	
 	my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); 
         #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) {
 	    my $current_output = ''; 
 	    my ($usersection,$username,$userdomain) = split /:/,$person;
@@ -503,8 +517,10 @@ ENDPART
 		$current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$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') {      
     #prints selected problems from the subdirectory 
 	$selectionmade = 6;
@@ -1008,7 +1024,7 @@ sub character_chart {
 		    $oddoffset = '-0.57 in';
 		    $evenoffset = '-0.57 in';
 		} elsif ($numberofcolumns == 2) {
-		    $textwidth = '9 cm';
+		    $textwidth = '93 mm';
 		    $textheight = '25.9 cm';
 		    $oddoffset = '-0.57 in';
 		    $evenoffset = '-0.57 in';
@@ -1037,7 +1053,7 @@ sub character_chart {
 		    $oddoffset = '-0.57 in';
 		    $evenoffset = '-0.57 in';
 		} elsif ($numberofcolumns == 2) {
-		    $textwidth = '9 cm';
+		    $textwidth = '96 mm';
 		    $textheight = '2 cm';
 		    $oddoffset = '-0.57 in';
 		    $evenoffset = '-0.57 in';
@@ -1072,9 +1088,9 @@ 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 /;
 	} elsif ($layout eq 'CAPA') {
  	    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 {
-		$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;
@@ -1119,9 +1135,9 @@ sub latex_corrections {
 
     my ($number_of_columns,$result) = @_;
 
-    $result =~ s/\\includegraphics{/\\includegraphics\[\\minipagewidth\]{/g;
+    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/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/$1/g;
 #-- LaTeX corrections