--- loncom/interface/lonprintout.pm	2002/10/22 22:07:50	1.81
+++ 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.81 2002/10/22 22:07:50 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);
@@ -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 = '';