--- loncom/interface/lonprintout.pm	2006/06/30 01:11:04	1.449
+++ loncom/interface/lonprintout.pm	2006/06/30 21:37:05	1.452
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.449 2006/06/30 01:11:04 albertel Exp $
+# $Id: lonprintout.pm,v 1.452 2006/06/30 21:37:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1262,7 +1262,7 @@ ENDPART
 	    }
 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
 	    $result .= '\end{document}';   
-	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
+	} elsif ($cleanURL=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
 		$resources_printed .= $currentURL.':';
@@ -1380,7 +1380,7 @@ ENDPART
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
+	    } elsif ($urlp=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		$resources_printed .= $urlp.':';
@@ -1562,6 +1562,7 @@ ENDPART
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+	 &adjust_number_to_print($helper);
 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
 	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
 	     $number_per_page=$num_todo;
@@ -1673,12 +1674,12 @@ ENDPART
 			       $selectionmade, 
 			       $helper->{'VARS'}->{'ANSWER_TYPE'});
     }
-
-    $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
-    $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
-    $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-    $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-
+    if ($numberofcolumns == 1) {
+	$result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+	$result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+    }
 
 #-- writing .tex file in prtspool 
     my $temp_file;
@@ -1874,7 +1875,7 @@ sub print_resources {
 			$rendered =~ s/\\end{document}//;
 		    }
 		    $current_output .= $rendered;		    
-		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+		} elsif ($res_url=~/\/(smppg|grppg|syllabus|aboutme|bulletinboard)$/) {
 		    $printed .= $curresline.':';
 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 
@@ -2197,7 +2198,7 @@ HELPERFRAGMENT
     # If the user has pfo (print for otheres) allow them to print all 
     # problems and resources  in the entier course, optionally for selected students
     if ($perm{'pfo'} && 
-        ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
+        ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|grppg|aboutme|bulletinboard)$/)) { 
 
         push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
 	push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
@@ -2304,7 +2305,7 @@ CHOOSE_STUDENTS
 	    }
 	}
 
-	my $code_selection = "<choice></choice>\n";
+	my $code_selection;
 	foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
 	    my $choice  = $code;
 	    if ($code =~ /^[A-Z]+$/) { # Alpha code
@@ -2316,11 +2317,12 @@ CHOOSE_STUDENTS
 	    $code_selection .='   
 	    <message><b>Choose single code from list</b></message>
 		<message></td><td></message>
-		<choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+		<dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+                  <choice></choice>
                   <exec>
                      push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
                   </exec>
-		</choices>
+		</dropdown>
 	    <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>
             '.$/;
 
@@ -2952,9 +2954,9 @@ sub preprocess {
     my $helper = Apache::lonhelper::getHelper();
 
     my $format = $helper->{VARS}->{$self->{'formatvar'}};
-#    if (substr($format, 2, 1) ne '1') {
-#        $helper->changeState($self->{NEXTSTATE});
-#    }
+    if (substr($format, 2, 1) ne '1') {
+        $helper->changeState($self->{NEXTSTATE});
+    }
    
     return 1;
 }