--- loncom/interface/lonprintout.pm	2006/03/23 22:32:10	1.433
+++ loncom/interface/lonprintout.pm	2006/05/24 10:49:04	1.438
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.433 2006/03/23 22:32:10 albertel Exp $
+# $Id: lonprintout.pm,v 1.438 2006/05/24 10:49:04 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1322,7 +1322,6 @@ ENDPART
 		$resources_printed .= $urlp.':';
 
 		&Apache::lonxml::remember_problem_counter();
-
 		$texversion.=&Apache::lonnet::ssi($urlp,%form);
 		if ($urlp=~/\.page$/) {
 		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
@@ -1671,13 +1670,14 @@ ENDPART
 			       $selectionmade, 
 			       $helper->{'VARS'}->{'ANSWER_TYPE'});
     }
-    #changes page's parameters for the one column output 
-    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'} /;
-    }
+    &Apache::lonnet::logthis("Resetting page e.g. height -> $helper->{'VARS'}->{'pagesize.height'}");
+    &Apache::lonnet::logthis("Before: $result \n--------------------------\n");
+    $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'} /;
+
+    &Apache::lonnet::logthis("After: $result \n----------------------------------\n");
 
 #-- writing .tex file in prtspool 
     my $temp_file;
@@ -2234,7 +2234,6 @@ ALL_PROBLEMS
       </resource>
     </state>
     <state name="PRINT_FORMATTING" title="How should results be printed?">
-    <nextstate>NUMBER_PER_PDF</nextstate>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
@@ -2242,17 +2241,15 @@ ALL_PROBLEMS
       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
     </choices>
-    </state>
-    <state name="NUMBER_PER_PDF" title="Number printed at once">
     <nextstate>PAGESIZE</nextstate>
     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
     <choices variable="SPLIT_PDFS">
        <choice computer="all">All assignments in a single PDF file</choice>
        <choice computer="sections">Each PDF contains exactly one section</choice>
        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber">Specify Number:</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT" relateddefault="all">
+            Specify Number:</choice>
     </choices>
-    <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
     </state>
 RESOURCE_SELECTOR
 
@@ -2263,6 +2260,7 @@ RESOURCE_SELECTOR
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+      <message><br /><hr /><br /> </message>
       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
   </state>
     $resource_selector
@@ -2296,12 +2294,13 @@ CHOOSE_STUDENTS
 	    }
 	    push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
 	}
-	$code_selection .=
-'   
-      <exec>
-        push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
-      </exec>
-    '.$/;
+	if (%codes_to_print) {
+	    $code_selection .='   
+             <exec>
+               push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+            </exec>
+            '.$/;
+	}
 
 	
 	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
@@ -2403,17 +2402,15 @@ CHOOSE_ANON1
       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
     </choices>
-    </state>
-    <state name="NUMBER_PER_PDF" title="Number assignments per pdf">
     <nextstate>PAGESIZE</nextstate>
     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
     <choices variable="SPLIT_PDFS">
        <choice computer="all">All assignments in a single PDF file</choice>
        <choice computer="sections">Each PDF contains exactly one section</choice>
        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber">Specify Number:</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT" relateddefault="all">
+           Specify Number:</choice>
     </choices>
-    <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
     </state>
 RESOURCE_SELECTOR
 
@@ -2423,6 +2420,7 @@ RESOURCE_SELECTOR
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+    <message><br /><hr /><br /></message>
     <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
 
     </state>
@@ -2884,6 +2882,12 @@ sub render {
         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
     }
 
+    my $width = 18;
+    my $format = $helper->{VARS}->{$self->{'formatvar'}};
+    if (substr($format, 2, 1) ne '1') {
+	$width = 9;
+    }
+
     $result .= <<ELEMENTHTML;
 
 <p>How should the column be formatted?</p>
@@ -2891,7 +2895,7 @@ sub render {
 <table cellpadding='3'>
   <tr>
     <td align='right'><b>Width</b>:</td>
-    <td align='left'><input type='text' name='$var.width' value='18' size='4'></td>
+    <td align='left'><input type='text' name='$var.width' value='$width' size='4'></td>
     <td align='left'>
       <select name='$var.widthunit'>
         <option>cm</option><option>in</option>
@@ -2932,9 +2936,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;
 }