--- loncom/interface/lonprintout.pm	2006/07/17 23:11:10	1.463
+++ loncom/interface/lonprintout.pm	2006/08/02 20:49:55	1.474
@@ -1,7 +1,8 @@
+#
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.463 2006/07/17 23:11:10 foxr Exp $
+# $Id: lonprintout.pm,v 1.474 2006/08/02 20:49:55 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -892,7 +893,7 @@ sub IndexCreation {
 
 sub print_latex_header {
     my $mode=shift;
-    my $output='\documentclass[letterpaper,twoside]{article}';
+    my $output='\documentclass[letterpaper,twoside]{article}\raggedbottom';
     if (($mode eq 'batchmode') || (!$perm{'pav'})) {
 	$output.='\batchmode';
     }
@@ -1759,12 +1760,12 @@ ENDPART
 			       $selectionmade, 
 			       $helper->{'VARS'}->{'ANSWER_TYPE'});
     }
-    if ($numberofcolumns == 1) {
+    #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;
@@ -2064,7 +2065,7 @@ sub init_perm {
 	$perm{'pav'}=&Apache::lonnet::allowed('pav',
 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     }
-    $perm{'pfo'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});
+    $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
     if (!$perm{'pfo'}) {
 	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
@@ -2241,10 +2242,15 @@ sub printHelper {
 
     $helper->declareVar('SEQUENCE');
 
+    # If we're in a sequence...
 
+    my $start_new_option;
+    if ($perm{'pav'}) {
+	$start_new_option = 
+	    "<option text='".&mt('Start new page<br />before selected').
+	    "' variable='FINISHPAGE' />";
+    }
 
-    # If we're in a sequence...
-    my $startnew=&mt('Start new page<br />before selected');
     if (($helper->{'VARS'}->{'construction'} ne '1') &&
 
 	$helper->{VARS}->{'postdata'} &&
@@ -2253,6 +2259,7 @@ sub printHelper {
         push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
         push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
@@ -2261,7 +2268,7 @@ sub printHelper {
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='$startnew' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
 
@@ -2272,7 +2279,7 @@ sub printHelper {
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='$startnew' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
 HELPERFRAGMENT
@@ -2295,7 +2302,7 @@ HELPERFRAGMENT
       <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='$startnew' variable='FINISHPAGE' />
+      $start_new_option
     </resource>
   </state>
   <state name="ALL_RESOURCES" title="Select Resource(s) to print">
@@ -2304,14 +2311,14 @@ HELPERFRAGMENT
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap; </filterfunc>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='$startnew' variable='FINISHPAGE' />
+      $start_new_option
     </resource>
   </state>
 ALL_PROBLEMS
 
 	if ($helper->{VARS}->{'assignment'}) {
 	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
-	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
+	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
 
 	# resource_selector will hold a few states that:
@@ -2332,7 +2339,7 @@ ALL_PROBLEMS
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='$startnew' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
     <state name="PRINT_FORMATTING" title="How should results be printed?">
@@ -2398,7 +2405,7 @@ CHOOSE_STUDENTS
 	}
 	if (%codes_to_print) {
 	    $code_selection .='   
-	    <message><b>Choose single code from list</b></message>
+	    <message><b>Choose single CODE from list:</b></message>
 		<message></td><td></message>
 		<dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
                   <choice></choice>
@@ -2406,7 +2413,7 @@ CHOOSE_STUDENTS
                      push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
                   </exec>
 		</dropdown>
-	    <message></td></tr><tr><td colspan="2"><hr width=\'33%\' /></td></tr><tr><td></message>
+	    <message></td></tr><tr><td></message>
             '.$/;
 
 	}
@@ -2426,9 +2433,12 @@ CHOOSE_STUDENTS
 	    $codechoice='<choice computer="default">Default</choice>';
 	}
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
-  <state name="CHOOSE_ANON1" title="Select Students and Resources">
+  <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">
     <nextstate>SELECT_PROBLEMS</nextstate>
-    <message><table><tr><td><b>Number of anonymous assignments to print:</b></td><td></message>
+    <message><h4>Fill out one of the forms below</h4></message>
+    <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">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
@@ -2450,9 +2460,10 @@ CHOOSE_STUDENTS
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
     $codechoice
     </dropdown>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
-    <message></td></tr><tr><td></message>
-    <message><b>Enter a CODE to print:</b></td><td></message>
+    <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
+    <message></td></tr><tr><td></table></message>
+    <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+    <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
     <string variable="SINGLE_CODE" size="10">
         <validator>
 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
@@ -2465,17 +2476,16 @@ CHOOSE_STUDENTS
 	   }
         </validator>
     </string>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+    <message></td></tr><tr><td></message>
         $code_selection
-
-    
-    <message><b>Reprint a set of saved CODEs:</b></message>
+    <message></td></tr></table></message>
+    <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+    <message><b>Select saved CODEs:</b></message>
     <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">
         $namechoice
     </dropdown>
     <message></td></tr></table></message>
-    <message><hr width='33%' /></message>
   </state>
   $resource_selector
 CHOOSE_ANON1
@@ -2483,7 +2493,7 @@ CHOOSE_ANON1
 
 	if ($helper->{VARS}->{'assignment'}) {
 	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
-	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
+	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
 	    
 
@@ -2496,7 +2506,7 @@ CHOOSE_ANON1
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='$startnew' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
     <state name="PRINT_FORMATTING" title="Format of the print job">
@@ -2534,9 +2544,12 @@ RESOURCE_SELECTOR
 CHOOSE_STUDENTS1
 
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
-  <state name="CHOOSE_ANON2" title="Select Students and Resources">
+  <state name="CHOOSE_ANON2" title="Select CODEd Assignments">
     <nextstate>SELECT_RESOURCES</nextstate>
-    <message><table><tr><td><b>Number of anonymous assignments to print:</b></td><td></message>
+    <message><h4>Fill out one of the forms below</h4></message>
+    <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">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
@@ -2558,9 +2571,9 @@ CHOOSE_STUDENTS1
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
     $codechoice
     </dropdown>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
-    <message></td></tr><tr><td></message>
-    <message><b>Enter a CODE to print:</b></td><td></message>
+    <message></td></tr><tr><td></table></message>
+    <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+    <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
     <string variable="SINGLE_CODE" size="10">
         <validator>
 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
@@ -2573,15 +2586,16 @@ CHOOSE_STUDENTS1
 	   }
         </validator>
     </string>
-    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+    <message></td></tr><tr><td></message>
         $code_selection
-    <message><b>Reprint a set of saved CODEs:</b></message>
+    <message></td></tr></table></message>
+    <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+    <message><b>Select saved CODEs:</b></message>
     <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">
         $namechoice
     </dropdown>
     <message></td></tr></table></message>
-    <message><hr width='33%' /></message>
   </state>
     $resource_selector
 CHOOSE_ANON2
@@ -2637,10 +2651,10 @@ CHOOSE_FROM_SUBDIR
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblem</filterfunc>
+      <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='$startnew' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
 CHOOSE_FROM_ANY_SEQUENCE
@@ -2969,6 +2983,7 @@ sub new {
 
     $self->{NEXTSTATE} = shift;
     bless($self);
+
     return $self;
 }
 
@@ -2978,8 +2993,10 @@ sub render {
     my $result = '';
     my $var = $self->{'variable'};
 
+
+
     if (defined $self->{ERROR_MSG}) {
-        $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+        $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';
     }
 
     my $format = $helper->{VARS}->{$self->{'formatvar'}};
@@ -2998,90 +3015,120 @@ sub render {
     }
 
 
-
-    my ($width_and_units,
-	$height_and_units,
-	$margin_and_units)  = 
-	    &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
-
-
-    my ($width,  $wunits) = split(/ /, $width_and_units);
-    my ($height, $hunits) = split(/ /, $height_and_units);
-    my ($margin, $munits) = split(/ /, $margin_and_units);
-
-
-
-    # This code is a bit ugly and not very scalable with additional units.
-    # but I'm not sure my poor perlmanship knows a better way yet RF
-
-    my ($wuoptions, $huoptions, $muoptions);
+    my %size;
+    ($size{'width_and_units'},
+     $size{'height_and_units'},
+     $size{'margin_and_units'})=
+	 &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
     
-    if ($wunits eq 'cm') {
-	$wuoptions = '<option>cm</option><option>in</option>';
-    } else {
-	$wuoptions = '<option>in</option><option>cm</option>';
-    }
-    if ($hunits eq 'cm') {
-	$huoptions =  '<option>cm</option><option>in</option>';
-    } else {
-	$huoptions = '<option>in</option><option>cm</option>';
-    }
-    if ($munits eq 'cm') {
-	$muoptions = '<option>cm</option><option>in</option>';
-    } else {
-	$muoptions = '<option>in</option><option>cm</option>';
+    foreach my $dimension ('width','height','margin') {
+	($size{$dimension},$size{$dimension.'_unit'}) =
+	    split(/ +/, $size{$dimension.'_and_units'},2);
+       	
+	foreach my $unit ('cm','in') {
+	    $size{$dimension.'_options'} .= '<option ';
+	    if ($size{$dimension.'_unit'} eq $unit) {
+		$size{$dimension.'_options'} .= 'selected="selected" ';
+	    }
+	    $size{$dimension.'_options'} .= '>'.$unit.'</option>';
+	}
     }
 
-    $result .= <<ELEMENTHTML;
+    # Adjust margin for LaTeX margin: .. requires units == cm or in.
 
+    if ($size{'margin_unit'} eq 'in') {
+	$size{'margin'} += 1;
+    }  else {
+	$size{'margin'} += 2.54;
+    }
+    $result .= <<ELEMENTHTML;
 
+  
 
-<p>How should the column be formatted?</p>
+<p>How should each column be formatted?</p>
 
 <table cellpadding='3'>
   <tr>
     <td align='right'><b>Width</b>:</td>
-    <td align='left'><input type='text' name='$var.width' value="$width" size='4'></td>
+    <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
     <td align='left'>
       <select name='$var.widthunit'>
-      $wuoptions
+      $size{'width_options'}
       </select>
     </td>
   </tr>
   <tr>
     <td align='right'><b>Height</b>:</td>
-    <td align='left'><input type='text' name="$var.height" value="$height" size='4'></td>
+    <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
     <td align='left'>
       <select name='$var.heightunit'>
-      $huoptions
+      $size{'height_options'}
       </select>
     </td>
   </tr>
   <tr>
     <td align='right'><b>Left margin</b>:</td>
-    <td align='left'><input type='text' name='$var.lmargin' value="$margin" size='4'></td>
+    <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
     <td align='left'>
       <select name='$var.lmarginunit'>
-      $muoptions
+      $size{'margin_options'}
       </select>
     </td>
   </tr>
 </table>
 
-<p>Hint: Some instructors like to leave scratch space for the student by
-making the width much smaller than the width of the page.</p>
+<!--<p>Hint: Some instructors like to leave scratch space for the student by
+making the width much smaller than the width of the page.</p>-->
 
 ELEMENTHTML
 
     return $result;
 }
 
-# If the user didn't select 1 column, skip this state.
+
 sub preprocess {
     my $self = shift;
     my $helper = Apache::lonhelper::getHelper();
 
     my $format = $helper->{VARS}->{$self->{'formatvar'}};
+
+    #  If the user does not have 'pav' privilege, set default widths and
+    #  on to the next state right away.
+    #
+    if (!$perm{'pav'}) {
+	my $var = $self->{'variable'};
+	my $format = $helper->{VARS}->{$self->{'formatvar'}};
+	
+	my ($laystyle, $cols, $papersize) = split(/\|/, $format);
+	($papersize)                      = split(/ /, $papersize);
+	
+	
+	if ($laystyle eq 'L') {
+	    $laystyle = 'album';
+	} else {
+	    $laystyle = 'book';
+	}
+	#  Figure out some good defaults for the print out and set them:
+	
+	my %size;
+	($size{'width'},
+	 $size{'height'},
+	 $size{'lmargin'})=
+	     &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
+	
+	foreach my $dim ('width', 'height', 'lmargin') {
+	    my ($value, $units) = split(/ /, $size{$dim});
+	    	    
+	    $helper->{VARS}->{"$var.".$dim}      = $value;
+	    $helper->{VARS}->{"$var.".$dim.'unit'} = $units;
+	    
+	}
+	
+
+	# Transition to the next state
+
+	$helper->changeState($self->{NEXTSTATE});
+    }
    
     return 1;
 }
@@ -3103,14 +3150,22 @@ sub postprocess {
     # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed 
     # by an optional period, followed by digits, ending the string
 
-    if ($width !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+    if ($width !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid width; please type only a number.<br />\n";
     }
-    if ($height !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+    if ($height !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid height; please type only a number.<br />\n";
     }
-    if ($lmargin !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+    if ($lmargin !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid left margin; please type only a number.<br />\n";
+    } else {
+	# Adjust for LaTeX 1.0 inch margin:
+
+	if ($env{"form.${var}.lmarginunit"} eq "in") {
+	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 1;
+	} else {
+	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 2.54;
+	}
     }
 
     if (!$error) {