--- loncom/interface/lonprintout.pm	2010/04/01 23:38:26	1.568.2.4
+++ loncom/interface/lonprintout.pm	2010/05/24 22:10:42	1.568.2.7
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.568.2.4 2010/04/01 23:38:26 raeburn Exp $
+# $Id: lonprintout.pm,v 1.568.2.7 2010/05/24 22:10:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,11 +306,16 @@ sub set_font_size {
 
     my ($text) = @_;
 
-    $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
-    $text =~ s/\\end{document}/}\\end{document}/;
-    return $text;
+    # 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;
 }
 
 # include_pdf - PDF files are included into the 
@@ -1283,7 +1288,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 /;}
@@ -1544,7 +1555,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;
@@ -2293,7 +2304,11 @@ ENDPART
 		if ($i > 0) {
 		    $result .= '\cleardoublepage';
 		}
-		$result .= &include_pdf($urlp);
+                my $texfrompdf = &include_pdf($urlp);
+                if ($flag_latex_header_remove ne 'NO') {
+                    $texfrompdf = &latex_header_footer_remove($texfrompdf);
+                }
+                $result .= $texfrompdf;
 		if ($i != $#master_seq) {
 		    if ($numberofcolumns eq '1') {
 			$result .= '\newpage';