--- loncom/interface/lonprintout.pm	2023/04/18 18:48:14	1.627.2.32.2.7
+++ loncom/interface/lonprintout.pm	2023/01/15 01:19:50	1.683
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.627.2.32.2.7 2023/04/18 18:48:14 raeburn Exp $
+# $Id: lonprintout.pm,v 1.683 2023/01/15 01:19:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -309,7 +309,7 @@ CHOOSE_STUDENTS
 #     prompt_text   - Text to use to prompt user.
 #     resource_options - Resource tag options e.g.
 #                        "multichoice='1', toponly='1', addstatus='1',
-#                         modallink='1'"
+#                         modallink='1'" 
 #                     that control the selection and appearance of the
 #                     resource selector.
 #     variable      - Name of the variable to hold the choice
@@ -452,8 +452,8 @@ sub generate_common_choosers {
     my $randomly_ordered_warning =
         &get_randomly_ordered_warning($helper, $map);
 
-    # code for a few states used for printout launched from both
-    # /adm/navmaps and from a resource by a privileged user:
+    # code for a few states used for printout launched from both 
+    # /adm/navmpas and from a resource by a privileged user:
     #   - To allow resources to be selected for printing.
     #   - To determine pagination between assignments.
     #   - To determine how many assignments should be bundled into a single PDF.
@@ -711,7 +711,6 @@ sub printable {
 #       date for printing checks printstartdate param first, then, if not set,
 #       opendate param, then, if not set, contentopen param.
 
-
 sub get_print_dates {
     my $res = shift;
     my $partsref = $res->parts();
@@ -756,7 +755,7 @@ sub get_print_dates {
 # get_print_dates but namvaps::course_print_dates are gotten...and not converted
 # to times either.
 #
-# @param $res - Reference to a resource hash from lonnavmaps::resource.
+# @param $res - Reference to a resource has from lonnvampas::resource.
 #
 # @return (opendate, closedate)
 #
@@ -770,7 +769,7 @@ sub course_print_dates {
     my @close_dates;
     my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.
 
-    # Don't bother looping over undefined or empty parts array;
+    # Don't bother looping over undefined or empty parts arraY;
 
     if (@parts) {
 	foreach my $part (@parts) {
@@ -796,7 +795,7 @@ sub map_print_dates {
     my $navmap = $res->{NAV_MAP}; # slightly OO dirty.
 
 
-    # Don't bother looping over undefined or empty parts array;
+    # Don't bother looping over undefined or empty parts arraY;
 
     if (@parts) {
 	foreach my $part (@parts) {
@@ -879,7 +878,7 @@ sub master_seq_to_person_seq {
     }
     
     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
-                                                           $code,$unhidden);
+                                                           $code, $unhidden);
     my ($start,$finish);
 
     if ($map) {
@@ -897,15 +896,15 @@ sub master_seq_to_person_seq {
     my $iterator         = $navmap->getIterator($start,$finish,{},1);
 
     #  Iterate on the resource..select the items that are randomly selected
-    #  and that are in the seq_hash.  Presumably the iterator will take care
-    #  of the random ordering part of the deal.
+    #  and that are in the seq_has.  Presumably the iterator will take care
+    # of the random ordering part of the deal.
+    #
     my $curres;
     while ($curres = $iterator->next()) {
 	#
 	#  Only process resources..that are not removed by randomout...
 	#  and are selected for printint as well.
 	#
-
         if (ref($curres) && ! $curres->randomout()) {
             my $currsymb = $curres->symb();
             if (exists($seq_hash{$currsymb})) {
@@ -974,13 +973,14 @@ sub set_font_size {
     my ($text) = @_;
 
     # There appear to be cases where the font directive is empty.. in which
-    # case the first substitution would insert a spurious \ oh happy day.
+    # 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}/;
+        $text =~ s/\\end\{document}/}\\end{document}/;
+
     }
     return $text;
 
@@ -992,7 +992,7 @@ sub set_font_size {
 #  - The PDF, if necessary, is replicated.
 #  - The PDF is added to the list of files to convert to postscript (along with the images).
 #  - The LaTeX is added to include the final converted postscript in the file as an included
-#    job.  The assumption is that the includepsheader.ps header will be included.
+#    job.  The assumption is that the includedpsheader.ps header will be included.
 #
 # Parameters:
 #   pdf_uri   - URI of the PDF file to include.
@@ -1016,9 +1016,9 @@ sub include_pdf {
 	$file = &Apache::lonnet::filelocation('',$pdf_uri);
     }
 
-    #  The file is now replicated locally ... or it did not exist in the first place
+    #  The file isn ow replicated locally.. or it did not exist in the first place
     # (unlikely).  If it did exist, add the pdf to the set of files/images that
-    # need to be converted for this print job:
+    # need tob e converted for this print job:
 
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     $file =~ s{(.*)/res/}{$londocroot/res/};
@@ -1155,8 +1155,8 @@ sub printf_style_subst {
 	if ($size ne "") {
 	    $subst = substr($subst, 0, $size);
 	    
-	    #  Here's a nice edge case ... suppose the end of the
-	    #  substring is a \.  In that case may have just
+	    #  Here's a nice edge case.. supose the end of the
+	    #  substring is a \.  In that case may have  just
 	    #  chopped off a TeX escape... in that case, we append
 	    #   " " for the trailing character, and let the field 
 	    #  spill over a bit (sigh).
@@ -1192,12 +1192,12 @@ sub printf_style_subst {
 #     %s    - The section if it is supplied.
 #
 sub format_page_header {
-    my ($width, $format, $assignment, $course, $student) = @_;
+    my ($width, $format, $assignment, $course, $student, $section) = @_;
 
 
 
     $width = &recalcto_mm($width); # Get width in mm.
-    my $chars_per_line = int($width/2);   # Character/textline.
+    my $chars_per_line = int($width/1.6);   # Character/textline.
 
     #  Default format?
 
@@ -1213,38 +1213,34 @@ sub format_page_header {
 	# - Allow the assignment to be 2 lines (wrapped).
 	#
 
-        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);
-        }
+	
 
-        $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
+	my $name_length    = int($chars_per_line *3 /4);
+	my $sec_length     = int($chars_per_line / 5);
 
-    } 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!!!
+	$format  = "%$name_length".'n';
 
-    }
+	if ($section) {
+	    $format .=  ' - Sec: '."%$sec_length".'s';
+	}
 
-    return $format;
+	$format .= '\\\\%c \\\\ %a';
+        
 
+    }
+    # 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
@@ -1444,7 +1440,7 @@ sub compare_names {
     }
 
     # Break the tie on the first name, but there are leading (possibly trailing
-    # whitespaces to get rid of first)
+    # whitespaces to get rid of first 
     #
     $f1 =~ s/^\s+//;		# Remove leading...
     $f1 =~ s/\s+$//;		# Trailing spaces from first 1...
@@ -1981,6 +1977,8 @@ 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;
 }
@@ -2003,7 +2001,6 @@ 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);
@@ -2215,8 +2212,8 @@ sub unsupported {
     }
     if ($mode ne '') {$mode='\\'.$mode}
     my $result = &print_latex_header($mode);
-    if ($cleanURL=~m|^(/adm/wrapper/)?ext/|) {
-        $cleanURL=~s|^(/adm/wrapper/)?ext/|http://|;
+    if ($cleanURL=~m|^(/adm/wrapper)?/ext/|) {
+        $cleanURL=~s|^(/adm/wrapper)?/ext/|http://|;
         $cleanURL=~s|^http://https://|https://|;
         if ($shown eq $currentURL) {
             $shown = &Apache::lonxml::latex_special_symbols($cleanURL);
@@ -2228,7 +2225,7 @@ sub unsupported {
         if ($shown eq $currentURL) {
 	    $result.=&Apache::lonxml::latex_special_symbols($currentURL);
         } else {
-            $result.=$shown;   
+            $result.=$shown;
         }
     }
     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
@@ -2300,7 +2297,7 @@ sub print_page_in_course {
         } elsif ($resource->ext()) {
             $result.=&latex_header_footer_remove(&unsupported($current_url,$mode,$resource->symb));
 	} elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {
-            # these resources go through the XML transformer:   
+            # these resources go through the XML transformer:
             $result .= &Apache::lonxml::latex_special_symbols($resource->title()) . '\\\\';
 
 	    my $urlp = &Apache::lonnet::clutter($resource_src);
@@ -2314,7 +2311,7 @@ sub print_page_in_course {
 
 	    $form{'grade_target'}  = 'tex';
 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-	    $form{'pdfFormFields'} = 'no'; # 
+	    $form{'pdfFormFields'} = $pdfFormFields; # 
 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
 	    
 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -2535,7 +2532,7 @@ sub load_skips {
 
     my ($helper)  = @_;
 
-    # If this is the first time, unwrap the resources and extra spaces:
+    #  If this is the first time, unrap the resources and extra spaces:
 
     if (!$skips_loaded) {
 	@extraspace = (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'}));
@@ -2842,15 +2839,15 @@ ENDPART
     my @student_names=();
 
      
-    #  Common settings for the %form hash:
-    # In some cases these settings get overridden by specific cases, but the
+    #  Common settings for the %form has:
+    # In some cases these settings get overriddent by specific cases, but the
     # settings are common enough to make it worthwhile factoring them out
     # here.
     #
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-    $form{'pdfFormFields'} = 'no';
+    $form{'pdfFormFields'} = $pdfFormFields;
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -2989,9 +2986,10 @@ ENDPART
 		$result = &print_latex_header() . $result;
 	    }
 	    # End construction space sequence.
-	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
+	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard|ext\.tool)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
+                if ($currentURL=~/\/ext\.tool$/) {$currentURL=~s/^\/adm\/wrapper//;}
 		$resources_printed .= $currentURL.':';
 		my $texversion = &ssi_with_retries($currentURL, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
@@ -3173,7 +3171,6 @@ 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,
@@ -3188,9 +3185,10 @@ ENDPART
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
+	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard|ext\.tool)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
+                if ($urlp=~/\/ext\.tool$/) {$urlp=~s/^\/adm\/wrapper//;}
 		$resources_printed .= $urlp.':';
 		my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
@@ -3306,14 +3304,8 @@ ENDPART
 
          my $map;
          if ($helper->{VARS}->{'symb'}) {
-             unless ((($print_type eq 'all_problems_students') ||
-                      ($print_type eq 'incomplete_problems_selpeople_course')) &&
-                      $perm{'pfo'}) {
-                 ($map, my $id, my $resource) =
-                     &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
-             }
-         } elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
-             $map = $helper->{'VARS'}->{'SEQUENCE'};
+             ($map, my $id, my $resource) =
+                 &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
          }
 
 	 #loop over students
@@ -3403,8 +3395,6 @@ ENDPART
          if ($helper->{VARS}{'symb'}) {
              ($map, my $id, my $resource) =
                  &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
-         } elsif (($helper->{'VARS'}->{'postdata'} eq '/adm/navmaps') && ($perm{'pfo'})) {
-             $map = $helper->{'VARS'}->{'SEQUENCE'};
          }
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
@@ -3464,7 +3454,7 @@ ENDPART
 	 my $count=0;
          my $nohidemap;
          if ($perm{'pav'} && $perm{'vgr'}) {
-             $nohidemap = 1; 
+             $nohidemap = 1;
          }
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
@@ -3606,7 +3596,7 @@ ENDPART
             }
         }
         if ($env{'request.enc'}) {
-            $url = &Apache::lonenc::encrypted($url);
+            $url = &Apache::lonenc::encrypted($url); 
         }
         if ($url ne '') {
             my $symb = $helper->{VARS}{'symb'};
@@ -3803,7 +3793,7 @@ sub print_resources {
     #   nice to put the special in as a postscript comment
     #   e.g. \special{ps:\ENDOFSTUDENTSTAMP}  unfortunately,
     #   The special gets passed the \ and dvips puts it in the output file
-    #   so we will just rely on printout.pl to strip ENDOFSTUDENTSTAMP from the
+    #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #
 
@@ -3812,8 +3802,6 @@ sub print_resources {
     my $assignment;
     my $courseidinfo = &get_course();
     my $possprint = scalar(@{$master_seq});
-    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-    if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
 
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
@@ -3897,7 +3885,7 @@ sub print_resources {
 			$rendered =~ s/\\end\{document}//;
 		    }
 		    $current_output .= $rendered;		    
-		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard|ext\.tool)$/) {
 		    if ($i == 1) {
 			$syllabus_first = 1;
 		    }
@@ -3914,7 +3902,7 @@ sub print_resources {
 			$rendered =~ s/\\end\{document}//;
 		    }
 		    $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
-		} elsif($res_url =~ /\.pdf$/) {
+		} elsif($res_url = ~/\.pdf$/) {
 		    my $url = &Apache::lonnet::clutter($res_url);
 		    my $rendered  = &include_pdf($url);
 		    if ($remove_latex_header ne 'NO') {
@@ -3938,7 +3926,7 @@ sub print_resources {
 	if (($assignment ne $current_assignment) && ($assignment ne "")) {
 	    my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
 						  $assignment, $courseidinfo, 
-						  $fullname);
+						  $fullname, $usersection);
 	    my $header_start = ($columns_in_format == 1) ? '\lhead'
 		: '\fancyhead[LO]';
 	    $header_line = $header_start.'{'.$header_line.'}';
@@ -3970,8 +3958,8 @@ sub print_resources {
         } elsif ($print_incomplete) {
             $message = &mt('No incomplete resources');
         }
-        if ($message) {
-            $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
+        if ($message) { 
+	    $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\n \\vskip 100 mm { }\n",$moreenv->{'problem_split'});
         }
 	if ($remove_latex_header eq "NO") {
 	    $current_output = &print_latex_header() . $current_output;
@@ -3985,13 +3973,13 @@ sub print_resources {
     }
     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);
+    &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+                        $currentassignment, $courseidinfo, $fullname, $usersection);
     my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
     my $newheader = $header_start.'{'.$header_line.'}';
-
     if ($current_output=~/\\documentclass/) {
 	$current_output =~ s/\\begin\{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;
+
     } else {
 	my $blankpages = 
 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
@@ -4000,6 +3988,7 @@ sub print_resources {
 	    &copyright_line().' \newpage '.$blankpages.$end_of_student.
 	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
 	    $newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
+
     }
     #
     #  Close the student bracketing.
@@ -4223,12 +4212,19 @@ sub printHelper {
             $helper->{VARS}->{'symb'} = $env{'form.symb'};
         }
         if ($env{'form.url'}) {
-            unless ($env{'form.url'} eq '/adm/navmaps') {
-                $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
-            }
+            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
         }
+
     }
 
+    if ($env{'form.symb'}) {
+        $helper->{VARS}->{'symb'} = $env{'form.symb'};
+    }
+    if ($env{'form.url'}) {
+        unless ($env{'form.url'} eq '/adm/navmaps') {
+            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
+        }
+    }
     if ($helper->{VARS}->{'symb'} ne '') {
         $helper->{VARS}->{'symb'}=
 	    &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
@@ -4304,7 +4300,7 @@ sub printHelper {
                 if (ref($navmap)) {
                     my $res;
                     if ($symb ne '') {
-                        $res = $navmap->getBySymb($symb);
+	                $res = $navmap->getBySymb($symb);
                     } elsif ($map ne '') {
                         $res = $navmap->getResourceByUrl($map);
                     }
@@ -4314,7 +4310,7 @@ sub printHelper {
 	                ($course_open, $course_close) = &course_print_dates($res);
 	                ($map_open, $map_close) = &map_print_dates($res);
                     } else {
-                        $res_error = 1;
+                        $res_error = 1; 
                     }
                 } else {
                     $res_error = 1;
@@ -4504,7 +4500,7 @@ sub printHelper {
                 $optionText = &mt('Selected [_1]Incomplete Problems[_2] [_3]not in a folder[_4]' . $textSuffix,
                                   '<b>','</b>','<i>','</i>');
             } else {
-                $optionText = &mt('Selected [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
+                $optionText = &mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
                                   '<b>','</b>','<b><i>'.$sequenceTitle.'</b></i>');
             }
 	    push(@{$printChoices},
@@ -4659,7 +4655,7 @@ ALL_PROBLEMS
         #    with one state, and use REGEXPs at inclusion time to set state names
         #    and next states for better mix and match capability
         #
-	    
+
 	my $resource_selector=<<RESOURCE_SELECTOR;
     <state name="SELECT_RESOURCES" title="Select Resources">
     $randomly_ordered_warning
@@ -4757,7 +4753,7 @@ CHOOSE_ANON2
 
     # FIXME: That RE should come from a library somewhere.
     if (($perm{'pav'} 
-        && ($subdir ne '')
+        && ($subdir ne '') 
 	&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
 	&& (defined($helper->{'VARS'}->{'construction'})
 	    ||
@@ -4828,47 +4824,12 @@ CHOOSE_FROM_SUBDIR
                          '<b>','</b>','<b>','</b>','<b>','</b>'),
                          'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']);
                 if ($escapedSequenceName) {
-                    my ($randomly_ordered_warning,$codechoice,$code_selection,$namechoice) =
-                        &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,
-                                                  $isProblem,$symbFilter,$start_new_option);
-
-                    my $resource_selector = <<RESOURCE_SELECTOR;
-  <state name="CHOOSE_STUDENTS2" title="Select Students and Resources">
-    <choices variable='student_sort'>
-      <choice computer='0'>Sort by section then student</choice>
-      <choice computer='1'>Sort by students across sections.</choice>
-    </choices>
-    <message><br /><hr /><br /></message>
-    <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
-
-    </state>
-    <state name="SELECT_RESOURCES" title="Select Resources">
-    $randomly_ordered_warning
-    <nextstate>PRINT_FORMATTING</nextstate>
-    <message>(mark desired resources then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1" addstatus="1"
-              closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
-      <filterfunc>return $isNotMap;</filterfunc>
-      <mapurl>$escapedSequenceName</mapurl>
-      <valuefunc>return $symbFilter;</valuefunc>
-      $start_new_option
-      </resource>
-    </state>
-RESOURCE_SELECTOR
-
-                    my $anon3 = &generate_code_selector($helper,
-                                                        'CHOOSE_ANON3',
-                                                        'SELECT_RESOURCES',
-                                                        $codechoice,
-                                                        $code_selection,
-                                                        $namechoice) . $resource_selector;
-
-                    &Apache::lonxml::xmlparse($r, 'helper',$anon3);
+                    &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option);
                 }
             }
         }
         if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) {
-            &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
+           &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
   <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">
@@ -4902,7 +4863,7 @@ RESOURCE_SELECTOR
   <state name="CHOOSE_SEQUENCE_STUDENTS1" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">
-      <nextstate>CHOOSE_STUDENTS2</nextstate>
+      <nextstate>CHOOSE_STUDENTS</nextstate>
       <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
       <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
@@ -4912,7 +4873,7 @@ RESOURCE_SELECTOR
   <state name="CHOOSE_SEQUENCE_ANON2" title="Select Sequence To Print From">
     <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">
-      <nextstate>CHOOSE_ANON3</nextstate>
+      <nextstate>CHOOSE_ANON1</nextstate>
       <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
       <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
@@ -4922,7 +4883,7 @@ RESOURCE_SELECTOR
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
-              closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
+              closeallpages="1" modallink="1" $nocurrloc>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
@@ -4946,7 +4907,7 @@ CHOOSE_FROM_ANY_SEQUENCE
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
     <message>(mark desired resources then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
-              closeallpages="1" modallink="1" suppressNavmap="1" $nocurrloc>
+              closeallpages="1" modallink="1" $nocurrloc>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
@@ -5002,9 +4963,9 @@ CHOOSE_FROM_ANY_SEQUENCE
 
         if ($noprintmsg) {
             $paramHash = Apache::lonhelper::getParamHash();
-            $paramHash->{MESSAGE_TEXT} =
+	    $paramHash->{MESSAGE_TEXT} = 
                 '<p class="LC_info">'.$noprintmsg.'</p>';
-            Apache::lonhelper::message->new();
+	    Apache::lonhelper::message->new();
         }
     }
     $paramHash = Apache::lonhelper::getParamHash();
@@ -5229,7 +5190,7 @@ FONT_SELECTION
 		      return "$helper->{VARS}->{'probstatus'}";
                    </defaultvalue>
 		   <choice computer="problem">Homework Problem</choice>
-		   <choice computer="exam">Exam Problem</choice>
+		   <choice computer="exam">Bubblesheet Exam Problem</choice>
 		   <choice computer="survey">Survey question</choice>
                    ,choice computer="anonsurvey"Anonymous survey question</choice>
 		</dropdown>
@@ -5347,6 +5308,9 @@ sub render {
     my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');
+    my $pdfFormLabel=&mt('PDF Form Fields');
+    my $with=&mt('with Form Fields');
+    my $without=&mt('without Form Fields');
     
 
     $result.='<h3>'.&mt('Layout Options').'</h3>'
@@ -5355,6 +5319,7 @@ 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>'
@@ -5395,6 +5360,12 @@ 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();