--- loncom/interface/lonprintout.pm	2002/08/09 20:38:42	1.49
+++ loncom/interface/lonprintout.pm	2002/08/14 20:38:04	1.51
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.49 2002/08/09 20:38:42 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.51 2002/08/14 20:38:04 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -140,7 +140,6 @@ ENDPART
     my $laystyle = 'book';
     my $result = '';
     my $number_of_columns = 1;
-#    my $number_of_columns = $ENV{'form.numberofcolumns'};    
  
     if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml  
@@ -294,11 +293,7 @@ ENDPART
 	}
 	$result = &additional_cleanup($result);
 	
-	
-
-
-
-	
+       	
     }
 #-- corrections for the different page formats
     if ($layout eq 'CBI' and $numberofcolumns eq '1') {
@@ -316,7 +311,7 @@ ENDPART
 	$result =~ s/\\includegraphics{/\\includegraphics\[width=9\.0 cm\]{/g;
 #	$result =~ s/\\includegraphics{/\\includegraphics\[width=\\textwidth\]{/g;
 #	$result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[9.0cm\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
-	$result =~ s/(\\end{document})/\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Dept\. of Physics and Astronomy, MSU\\makebox\[1.5cm\]\[b\]{\\hfill}LON-CAPA\\copyright MSU GNU\/GPL $1/;
+	$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{longtable}\s*)(\\newline\\noindent\\makebox\[9\.0cm\]\[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;
@@ -353,7 +348,7 @@ ENDPART
     } 
     print $temp_file $result;
 $r->print(<<FINALEND);
-<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle">
+<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$filename&$laystyle&$numberofcolumns">
 </body>
 </html>
 FINALEND