--- loncom/interface/lonprintout.pm	2010/02/28 22:38:45	1.572
+++ loncom/interface/lonprintout.pm	2010/09/02 00:17:36	1.583.2.3
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.572 2010/02/28 22:38:45 raeburn Exp $
+# $Id: lonprintout.pm,v 1.583.2.3 2010/09/02 00:17:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -196,14 +196,19 @@ sub generate_code_selector {
     <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">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
-	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'} ) {
+
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -228,6 +233,8 @@ sub generate_code_selector {
 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
+	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
+	      return 'Specifying a code name is incompatible with specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }
@@ -306,7 +313,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;
 
@@ -497,12 +511,12 @@ sub printf_style_subst {
 #     %s    - The section if it is supplied.
 #
 sub format_page_header {
-    my ($width, $format, $assignment, $course, $student, $section) = @_;
+    my ($width, $format, $assignment, $course, $student) = @_;
 
 
 
     $width = &recalcto_mm($width); # Get width in mm.
-    my $chars_per_line = int($width/1.6);   # Character/textline.
+    my $chars_per_line = int($width/2);   # Character/textline.
 
     #  Default format?
 
@@ -518,58 +532,37 @@ sub format_page_header {
 	# - Allow the assignment to be 2 lines (wrapped).
 	#
 
-	
-
-	my $name_length    = int($chars_per_line *3 /4);
-	my $sec_length     = int($chars_per_line / 5);
-
-	$format  = "%$name_length".'n';
+        my $firstline = "$student $course";
+        if (length($firstline) > $chars_per_line) {
+            my $lastchar = $chars_per_line - length($student) - 1;
+            if ($lastchar > 0) {
+                $course = substr($course, 0, $lastchar);
+            } else {            # Nothing left of course:
+                $course = '';
+            }
+        }
+        if (length($assignment) > $chars_per_line) {
+            $assignment = substr($assignment, 0, $chars_per_line);
+        }
 
-	if ($section) {
-	    $format .=  ' - Sec: '."%$sec_length".'s';
-	}
+        $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
 
-	$format .= '\\\\%c \\\\ %a';
-        
+    } else {
+        # An open question is how to handle long user formatted page headers...
+        # A possible future is to support e.g. %na so that the user can control
+        # the truncation of the elements that can appear in the header.
+        #
+        $format =  &printf_style_subst("a", $format, $assignment);
+        $format =  &printf_style_subst("c", $format, $course);
+        $format =  &printf_style_subst("n", $format, $student);
+    
+        # If the user put %'s in the format string, they must be escaped
+        # to \% else LaTeX will think they are comments and terminate
+        # the line.. which is bad!!!
 
     }
-    # An open question is how to handle long user formatted page headers...
-    # A possible future is to support e.g. %na so that the user can control
-    # the truncation of the elements that can appear in the header.
-    #
-    $format =  &printf_style_subst("a", $format, $assignment);
-    $format =  &printf_style_subst("c", $format, $course);
-    $format =  &printf_style_subst("n", $format, $student);
-    $format =  &printf_style_subst("s", $format, $section);
-    
-    
-    # If the user put %'s in the format string, they  must be escaped
-    # to \% else LaTeX will think they are comments and terminate
-    # the line.. which is bad!!!
     
-    # If the user has role author, $course and $assignment are empty so
-    # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
-    if($format =~ /\\\\\s\\\\\s/) {
-        #TODO find sensible caption for page header
-        my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
-        $format =~ s/\\\\\s\\\\\s/$testPrintout/;
-    }
-    #
-    #  We're going to trust LaTeX to break lines appropriately, but
-    #  we'll truncate anything that's more than 3 lines worth of
-    # text.  This is also assuming (which will probably end badly)
-    # nobody's going to embed LaTeX control sequences in the title
-    # header or rather that those control sequences won't get broken
-    # by the stuff below.
-    #
-    my $total_length = 3*$chars_per_line;
-    if (length($format) > $total_length) {
-	$format = substr($format, 0, $total_length);
-    }
-
-
     return $format;
-    
 }
 
 #
@@ -1265,8 +1258,6 @@ sub get_course {
     my $courseidinfo;
     if (defined($env{'request.course.id'})) {
 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
-	my $sec = $env{'request.course.sec'};
-	    
     }
     return $courseidinfo;
 }
@@ -1289,6 +1280,7 @@ sub page_format_transformation {
 
     my $name = &get_name();
     my $courseidinfo = &get_course();
+    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     my $header_text  = $parmhash{'print_header_format'};
     $header_text     = &format_page_header($textwidth, $header_text, $assignment,
 					   $courseidinfo, $name);
@@ -1309,7 +1301,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 /;}
@@ -1540,7 +1538,9 @@ sub print_page_in_course {
 	my $title=&Apache::lonnet::gettitle($symb);
 	$title = &Apache::lonxml::latex_special_symbols($title);
     } else {
-	$result.=$currentURL;
+        my $esc_currentURL= $currentURL;
+        $esc_currentURL =~ s/_/\\_/g;
+	$result.=$esc_currentURL;
     }
     $result .= '\\\\';
 
@@ -1570,7 +1570,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|xml|html|htm|xhtml|xhtm)$/)  {		
 	    my $urlp = &Apache::lonnet::clutter($resource_src);
 	    my %form;
 	    my %moreenv;
@@ -1581,7 +1581,7 @@ sub print_page_in_course {
 
 	    $form{'grade_target'}  = 'tex';
 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-	    $form{'pdfFormFiels'} = $pdfFormFields; # 
+            $form{'pdfFormFields'} = 'no';
 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
 	    
 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -1685,8 +1685,8 @@ sub print_page_in_course {
 # List of recently generated print files
 #
 sub recently_generated {
-    my $r=shift;
-    my $prtspool=$r->dir_config('lonPrtDir');
+    my ($prtspool) = @_;
+    my $output;
     my $zip_result;
     my $pdf_result;
     opendir(DIR,$prtspool);
@@ -1719,10 +1719,10 @@ sub recently_generated {
 	if ($ext eq 'zip') { $zip_result .= $result; }
     }
     if ($zip_result || $pdf_result) {
-        $r->print('<hr />');
+        $output ='<hr />';
     }
     if ($zip_result) {
-	$r->print('<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
+	$output .='<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
                   .&Apache::loncommon::start_data_table()
                   .&Apache::loncommon::start_data_table_header_row()
                   .'<th>'.&mt('Download').'</th>'
@@ -1730,11 +1730,10 @@ sub recently_generated {
                   .'<th>'.&mt('File Size (Bytes)').'</th>'
                   .&Apache::loncommon::end_data_table_header_row()
                   .$zip_result
-                  .&Apache::loncommon::end_data_table()
-        );
+                  .&Apache::loncommon::end_data_table();
     }
     if ($pdf_result) {
-	$r->print('<h3>'.&mt('Recently generated printouts')."</h3>\n"
+	$output .='<h3>'.&mt('Recently generated printouts')."</h3>\n"
                   .&Apache::loncommon::start_data_table()
                   .&Apache::loncommon::start_data_table_header_row()
                   .'<th>'.&mt('Download').'</th>'
@@ -1742,9 +1741,9 @@ sub recently_generated {
                   .'<th>'.&mt('File Size (Bytes)').'</th>'
                   .&Apache::loncommon::end_data_table_header_row()
                   .$pdf_result
-                  .&Apache::loncommon::end_data_table()
-        );
+                  .&Apache::loncommon::end_data_table();
     }
+    return $output;
 }
 
 #
@@ -2090,7 +2089,7 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-    $form{'pdfFormFields'} = $pdfFormFields;
+    $form{'pdfFormFields'} = 'no';
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -2110,7 +2109,6 @@ ENDPART
 	&Apache::lonnet::delenv('construct.style');
     }
 
-
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
@@ -2280,9 +2278,9 @@ ENDPART
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
-	     ) { 
-
+	     ) {
 
+ 
         #-- produce an output string
 	if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')  or
 	    ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {
@@ -2345,7 +2343,13 @@ ENDPART
 		&Apache::lonxml::remember_problem_counter();
 		if ($flag_latex_header_remove eq 'NO') {
 		    $texversion.=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  # RF
-		    $flag_latex_header_remove = 'YES';
+                    unless (($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') ||
+                            (($i==0) &&
+                             (($urlp=~/\.page$/) ||
+                              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ||
+                              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page')))) {
+                        $flag_latex_header_remove = 'YES';
+                    }
 		}
 		$texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($urlp=~/\.page$/) {
@@ -2353,7 +2357,7 @@ ENDPART
 		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
 		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
 		    $flag_page_in_sequence = 'YES';
-		} 
+		}
 
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
@@ -2365,13 +2369,22 @@ ENDPART
 
 		    &Apache::lonxml::restore_problem_counter();
 		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
-
+                    if ($urlp =~ /\.page$/) {
+                        $answer =~ s/\\end{document}(\d*)$//;
+                    }
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                        if ($urlp =~ /\.page$/) {
+                            my @probs = split(/\\keephidden{ENDOFPROBLEM}/,$texversion);
+                            my $lastprob = pop(@probs);
+                            $texversion = join('\keephidden{ENDOFPROBLEM}',@probs).
+                            $answer.'\keephidden{ENDOFPROBLEM}'.$lastprob;
+                        } else {
+                            $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                        }
 		    } else {
-			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $texversion =~ s/\\begin{document}//;
+#			    $texversion =~ s/\\begin{document}//; # FIXME
 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
 			    $title = &Apache::lonxml::latex_special_symbols($title);
 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
@@ -2401,6 +2414,7 @@ ENDPART
 		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
 		    my $name = &get_name();
 		    my $courseidinfo = &get_course();
+                    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		    $prevassignment=$assignment;
 		    my $header_text = $parmhash{'print_header_format'};
 		    $header_text    = &format_page_header($textwidth, $header_text,
@@ -2437,7 +2451,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';
@@ -2460,7 +2478,7 @@ ENDPART
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    }	    
+	    }
 	    if (&Apache::loncommon::connection_aborted($r)) { 
 		last; 
 	    }
@@ -2561,7 +2579,8 @@ ENDPART
 	     $resources_printed .= ":";
 	     $print_array[$i].=$output;
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
-	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
+#	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
+	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
 	     $flag_latex_header_remove = 'YES';
 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
 	 }
@@ -2935,7 +2954,7 @@ sub print_resources {
 	$i++;
 
 	if ( !($type eq 'problems' && 
-	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
+	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
 		if ($res_url!~m|^ext/|
@@ -2944,6 +2963,18 @@ sub print_resources {
 		    &Apache::lonxml::remember_problem_counter();    
 
 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+                    if ($res_url =~ /\.page$/) {
+                        if ($remove_latex_header eq 'NO') {
+                            if (!($rendered =~ /\\begin\{document\}/)) {
+                                $rendered = &print_latex_header().$rendered;
+                            }
+                        }
+                        if ($remove_latex_header eq 'YES') {
+                            $rendered = &latex_header_footer_remove($rendered);
+                        } else {
+                            $rendered =~ s/\\end{document}\d*//;
+                        }
+                    }
 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 			#   Use a copy of the hash so we don't pervert it on future loop passes.
@@ -2961,7 +2992,9 @@ sub print_resources {
 
 			    
 			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $header =~ s/\\begin{document}//;     #<<<<<
+                            unless ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') {
+                                $header =~ s/\\begin{document}//;     #<<<<<
+                            }
 			    my $title = &Apache::lonnet::gettitle($curresline);
 			    $title = &Apache::lonxml::latex_special_symbols($title);
 			    my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
@@ -3022,20 +3055,21 @@ sub print_resources {
 	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
 
-
+    if ($syllabus_first) {
+        $current_output =~ s/\\\\ Last updated:/Last updated:/
+    }
     my $courseidinfo = &get_course();
+    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+    if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $header_line =
 	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
-			    $currentassignment, $courseidinfo, $fullname, $usersection);
+			    $currentassignment, $courseidinfo, $fullname);
     my $header_start = ($columns_in_format == 1) ? '\lhead'
 	                                         : '\fancyhead[LO]';
     $header_line = $header_start.'{'.$header_line.'}';
-    if ($current_output=~/\\documentclass/ && (!$syllabus_first)) {
+    if ($current_output=~/\\documentclass/) {
 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
-    } elsif ($syllabus_first) {
-
-	$current_output =~ s/\\\\ Last updated:/Last updated:/
     } else {
 	my $blankpages = 
 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
@@ -3710,7 +3744,7 @@ CHOOSE_STUDENTS1
     <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">
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
@@ -3718,6 +3752,10 @@ CHOOSE_STUDENTS1
 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
+        if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+             (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+            return 'Specifying number of codes to print and a specific code is not compatible';
+        }
 	return undef;
        </validator>
     </string>
@@ -3741,6 +3779,8 @@ CHOOSE_STUDENTS1
 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
 						      \$helper->{'VARS'}{'CODE_OPTION'});
+	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
+	      return 'Specifying a code name is incompatible specifying number of codes.';
 	   } else {
 	       return undef;	# Other forces control us.
 	   }
@@ -4088,10 +4128,12 @@ PROBTYPE
         return $helper;
     }    
 
-    $r->print($helper->display());
+    my $footer;
     if ($helper->{STATE} eq 'START') {
-	&recently_generated($r);
+        my $prtspool=$r->dir_config('lonPrtDir');
+        $footer = &recently_generated($prtspool);
     }
+    $r->print($helper->display($footer));
     &Apache::lonhelper::unregisterHelperTags();
 
     return OK;
@@ -4167,9 +4209,6 @@ sub render {
     my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');
-    my $pdfFormLabel=&mt('PDF-Formfields');
-    my $with=&mt('with Formfields');
-    my $without=&mt('without Formfields');
     
 
     $result.='<h3>'.&mt('Layout Options').'</h3>'
@@ -4178,7 +4217,6 @@ sub render {
             .'<th>'.$PageLayout.'</th>'
             .'<th>'.$NumberOfColumns.'</th>'
             .'<th>'.$PaperType.'</th>'
-            .'<th>'.$pdfFormLabel.'</th>'
             .&Apache::loncommon::end_data_table_header_row()
             .&Apache::loncommon::start_data_table_row()
     .'<td>'
@@ -4219,12 +4257,6 @@ sub render {
     $result .= <<HTML;
         </select>
     </td>
-    <td align='center'>
-        <select name='${var}.pdfFormFields'>
-            <option selected="selected" value="no">$without</option>
-            <option value="yes">$with</option>
-        </select>
-    </td>
 HTML
     $result.=&Apache::loncommon::end_data_table_row()
             .&Apache::loncommon::end_data_table();