--- loncom/interface/lonprintout.pm	2010/01/12 10:40:01	1.569
+++ loncom/interface/lonprintout.pm	2010/04/19 10:29:40	1.575
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.569 2010/01/12 10:40:01 foxr Exp $
+# $Id: lonprintout.pm,v 1.575 2010/04/19 10:29:40 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,7 +306,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 +1316,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 /;}
@@ -1781,6 +1794,8 @@ sub get_page_breaks  {
 #   This is done as follows:
 #    POSSIBLE_RESOURCES has the list of possible resources.
 #    EXTRASPACE         has the list of extra space values.
+#    EXTRASPACE_UNITS   is the set of resources for which the units are
+#                       mm. All others are 'in'.
 #    
 #    The resource is found in the POSSIBLE_RESOURCES to get the index
 #    of the EXTRASPACE value.
@@ -1792,6 +1807,7 @@ sub get_page_breaks  {
 
 
 my %possible_resources;
+my %extraspace_mm;
 my @extraspace;
 my $skips_loaded       = 0;
 
@@ -1811,6 +1827,9 @@ sub load_skips {
 	    $possible_resources{$resource} = $i;
 	    $i++;
 	}
+	foreach my $mm_resource (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE_UNITS'})) {
+	    $extraspace_mm{$mm_resource} = 1;
+	}
 	$skips_loaded = 1;
     }
 }
@@ -1829,8 +1848,14 @@ sub get_extra_vspaces {
 
     my $result = '';
     if ($skip ne '') {
-	$result = '\vskip '.$skip.' mm';
+	my $units = 'in';
+	if (defined($extraspace_mm{$resource})) {
+	    $units = 'mm';
+	}
+	$result = '\vskip '.$skip.' '.$units;
     }
+
+	
     return $result;
 
 
@@ -1848,10 +1873,12 @@ sub get_extra_vspaces {
 #  Implicit input:
 #     $helper->{'VARS'}->{'EXTRASPACE'}  - the spaces helper var has the text field
 #                                          value.
+#     $helper->{'VARS'}->{'EXTRASPACE_UNITS'} - units for the skips (checkboxes).
 #     $helper->{'VARS'}->{'POSSIBLE_RESOURCES'}  - has the list of resources. |||
 #                                          separated of course.
 #  Implicit outputs:
-#     $env{'form.extrapsace'}
+#     $env{'form.extraspace'}
+#     $env{'form.extraspace_units'}
 #
 sub set_form_extraspace {
     my ($helper) = @_;
@@ -1870,6 +1897,7 @@ sub set_form_extraspace {
     }
 
     $env{'form.extraspace'}  = $result;
+    $env{'form.extraspace_units'} = $helper->{'VARS'}->{'EXTRASPACE_UNITS'};
     return $result;
     
 }
@@ -2049,6 +2077,7 @@ ENDPART
     &Apache::loncommon::store_course_settings('print',
 					      {'pagebreaks'    => 'scalar',
 					       'extraspace'    => 'scalar',
+					       'extraspace_units' => 'scalar',
 					       'lastprinttype' => 'scalar'});
     my %page_breaks  = &get_page_breaks($helper);
 
@@ -3177,6 +3206,7 @@ sub printHelper {
     &Apache::loncommon::restore_course_settings('print',
 						{'pagebreaks'  => 'scalar',
 						 'extraspace'  => 'scalar',
+						 'extraspace_units' => 'scalar',
 					         'lastprinttype' => 'scalar'});
     
     # This will persistently load in the data we want from the
@@ -3187,11 +3217,14 @@ sub printHelper {
 	    
 	    $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
 	    $helper->{VARS}->{EXTRASPACE} = $env{'form.extraspace'};
+	    $helper->{VARS}->{EXTRASPACE_UNITS} = $env{'form.extraspace_units'};
 	} else {
 	    my $state = $env{"form.CURRENT_STATE"};
 	    if ($state eq "START") {
 		$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
 		$helper->{VARS}->{EXTRASPACE} = $env{'form.extraspace'};
+		$helper->{VARS}->{EXTRASPACE_UNITS} = $env{'form.extraspace_units'};
+		
 	    }
 	}
 	
@@ -3311,10 +3344,14 @@ sub printHelper {
 	$start_new_option = 
 	    "<option text='".&mt('Start new page<br />before selected').
 	    "' variable='FINISHPAGE' />".
-	    "<option text='".&mt('Extra space(mm)<br />before selected').
+	    "<option text='".&mt('Extra space<br />before selected').
 	    "' variable='EXTRASPACE' type='text' />" .
 	    "<option " .
-	    "' variable='POSSIBLE_RESOURCES' type='hidden' />";
+	    "' variable='POSSIBLE_RESOURCES' type='hidden' />".
+	    "<option text='".&mt('Space units<br />check for mm').
+	    "' variable='EXTRASPACE_UNITS' type='checkbox' />"
+	    ;
+	    
 
     }
 
@@ -3493,7 +3530,7 @@ ALL_PROBLEMS
 							  'multichoice="1" addstatus="1" closeallpages="1"',
 							  'RESOURCES', 
 							  'PRINT_FORMATTING',
-							  '',
+							  $map,
 							  $isProblem, '', $symbFilter,
 							  $start_new_option);
 	$resource_selector .=  <<RESOURCE_SELECTOR;
@@ -4029,6 +4066,7 @@ FONT_SELECTION
 		   <choice computer="problem">Homework Problem</choice>
 		   <choice computer="exam">Exam Problem</choice>
 		   <choice computer="survey">Survey question</choice>
+                   ,choice computer="anonsurvey"Anonymous survey question</choice>
 		</dropdown>
 PROBTYPE
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);