--- loncom/interface/lonprintout.pm	2006/07/20 03:38:52	1.465
+++ loncom/interface/lonprintout.pm	2006/08/01 18:46:07	1.472
@@ -1,7 +1,8 @@
+#
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.465 2006/07/20 03:38:52 albertel Exp $
+# $Id: lonprintout.pm,v 1.472 2006/08/01 18:46:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2317,7 +2318,7 @@ 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 assinments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
 
 	# resource_selector will hold a few states that:
@@ -2404,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>
@@ -2412,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>
             '.$/;
 
 	}
@@ -2432,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) &&
@@ -2456,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'}           &&
@@ -2471,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
@@ -2489,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'];
 	}
 	    
 
@@ -2540,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) &&
@@ -2564,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'}           &&
@@ -2579,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
@@ -2643,7 +2651,7 @@ 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>
       $start_new_option
@@ -2975,6 +2983,7 @@ sub new {
 
     $self->{NEXTSTATE} = shift;
     bless($self);
+
     return $self;
 }
 
@@ -2984,6 +2993,8 @@ sub render {
     my $result = '';
     my $var = $self->{'variable'};
 
+
+
     if (defined $self->{ERROR_MSG}) {
         $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';
     }
@@ -3023,9 +3034,16 @@ sub render {
 	}
     }
 
-    $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 each column be formatted?</p>
 
@@ -3067,12 +3085,50 @@ 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;
 }
@@ -3102,6 +3158,14 @@ sub postprocess {
     }
     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) {