--- loncom/interface/lonprintout.pm	2002/11/14 20:02:00	1.88
+++ loncom/interface/lonprintout.pm	2002/11/18 14:35:25	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.88 2002/11/14 20:02:00 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.89 2002/11/18 14:35:25 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -420,14 +420,14 @@ ENDPART
     my $laystyle = 'book';
     my $assignment =  $ENV{'form.assignment'};
     if ($choice eq 'Subdirectory print') {
-	$layout = 'CAPA';
-	$papersize = 'Letter [8 1/2x11 in]';
-	$numberofcolumns = 2;
+	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\./)) {
-	$layout = 'CAPA';
-	$papersize = 'Letter [8 1/2x11 in]';
-	$numberofcolumns = 1;
+	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 $number_of_columns = 1; #used only for pages to determine the width of the cell
@@ -571,9 +571,9 @@ ENDPART
 	    }
 	    if ($current_output=~/\\documentclass/) {
 		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 {
-		$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;
 	    &Apache::lonnet::delenv('form.counter');