--- loncom/interface/lonprintout.pm	2010/03/30 10:48:42	1.573
+++ loncom/interface/lonprintout.pm	2010/05/24 09:36:26	1.579
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.573 2010/03/30 10:48:42 foxr Exp $
+# $Id: lonprintout.pm,v 1.579 2010/05/24 09:36:26 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -196,14 +196,19 @@ sub generate_code_selector {
     <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
-	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'} ) {
+
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -228,6 +233,8 @@ sub generate_code_selector {
 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
+	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
+	      return 'Specifying a code name is incompatible with specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }
@@ -306,7 +313,14 @@ sub set_font_size {
 
     my ($text) = @_;
 
-    $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
+    # There appear to be cases where the font directive is empty.. in which
+    # case the first substituion would  insert a spurious \ oh happy day.
+    # as this has been the cause of much mystery and hair pulling _sigh_
+
+    if ($font_size ne '') {
+
+	$text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
+    }
     $text =~ s/\\end{document}/}\\end{document}/;
     return $text;
 
@@ -1309,7 +1323,13 @@ sub page_format_transformation {
 	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
 	}
 	if ($papersize eq 'a4') {
-	    $text =~ s/(\\begin{document})/$1\\\\special\{papersize=210mm,297mm\}/;
+	    my $papersize_text;
+	    if ($perm{'pav'}) {
+		$papersize_text = '\\special{papersize=210mm,297mm}';
+	    } else {
+		$papersize_text = '\special{papersize=210mm,297mm}';
+	    }
+	    $text =~ s/(\\begin{document})/$1$papersize_text/;
 	}
     }
     if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
@@ -1570,7 +1590,7 @@ sub print_page_in_course {
 	}
 	# these resources go through the XML transformer:
 
-	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm\xhtml|xhtm)$/)  {		
+	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/)  {		
 	    my $urlp = &Apache::lonnet::clutter($resource_src);
 	    my %form;
 	    my %moreenv;
@@ -1581,7 +1601,7 @@ sub print_page_in_course {
 
 	    $form{'grade_target'}  = 'tex';
 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-	    $form{'pdfFormFiels'} = $pdfFormFields; # 
+	    $form{'pdfFormFields'} = $pdfFormFields; # 
 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
 	    
 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -3710,7 +3730,7 @@ CHOOSE_STUDENTS1
     <message><br /><hr /> <br /></message>
     <message><h3>Generate new CODEd Assignments</h3></message>
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
@@ -3718,6 +3738,10 @@ CHOOSE_STUDENTS1
 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -3741,6 +3765,8 @@ CHOOSE_STUDENTS1
 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
+	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
+	      return 'Specifying a code name is incompatible specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }