--- loncom/interface/lonprintout.pm	2009/11/17 11:32:23	1.565
+++ loncom/interface/lonprintout.pm	2014/04/24 15:31:39	1.642
@@ -1,8 +1,7 @@
-#
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.565 2009/11/17 11:32:23 foxr Exp $
+# $Id: lonprintout.pm,v 1.642 2014/04/24 15:31:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,17 +40,17 @@ use Apache::admannotations;
 use Apache::lonenc;
 use Apache::entities;
 use Apache::londefdef;
+# use Apache::structurelags;	# for language management.
 
 use File::Basename;
 
 use HTTP::Response;
-
 use LONCAPA::map();
-use POSIX qw(strftime);
 use Apache::lonlocal;
 use Carp;
 use LONCAPA;
 
+
 my %perm;
 my %parmhash;
 my $resources_printed;
@@ -76,7 +75,196 @@ my $font_size = 'normalsize';	# Default
 
 #----------------------------  Helper helpers. -------------------------
 
-#  Returns the text needd for a student chooser.
+## 
+# Filter function to determine if a resource is a printable sequence.
+#
+# @param $res -Resource to check.
+#
+# @return 1 - printable and a resource
+#         0 - either notm a sequence or not printable.
+#
+sub printable_sequence {
+    my $res = shift;
+
+    # Non-sequences are not listed:
+
+    if (!$res->is_sequence()) {
+	return 0;
+    }
+
+    # Person with pav or pfo can always print:
+
+    if ($perm{'pav'} || $perm{'pfo'}) {
+	return 1;
+    }
+
+    if ($res->is_sequence()) {
+	my $symb = $res->symb();
+	my $navmap   = $res->{NAV_MAP};
+
+	# Find the first resource in the map:
+
+	my $iterator = $navmap->getIterator($res, undef, undef, 1, 1);
+	my $first    = $iterator->next();
+
+	while (1) {
+	    if ($first == $iterator->END_ITERATOR) { last; }
+	    if (ref($first) && ! $first->is_sequence()) {last; }
+	    $first = $iterator->next();
+	}
+
+
+	# Might be an empty map:
+
+	if (!ref($first)) {
+	    return 0;
+	}
+	my $partsref = $first->parts();
+	my @parts    = @$partsref;
+	my ($open, $close) = $navmap->map_printdates($first, $parts[0]);
+	return &printable($open, $close);
+    }
+    return 0;
+}
+
+# BZ5209:
+#    Create the states needed to run the helper for incomplete problems from
+#    the current folder for selected students.
+#    This includes:
+#    -  A resource selector limited to problems (incompleteness must be
+#       calculated on a student per student basis.
+#    -  A student selector.
+#    -  Tie in to the FORMAT of the print job.
+#
+# States:
+#   CHOOSE_INCOMPLETE_PEOPLE_SEQ      - Resource selection.
+#   CHOOSE_STUDENTS_INCOMPLETE        - Student selection.
+#   CHOOSE_STUDENTS_INCOMPLETE_FORMAT - Format selection
+# Parameters:
+#    helper - the helper which already contains info about the current folder we can
+#             purloin.
+#    url    - Top url of the sequence
+# Return:
+#     XML that can be parsed by the helper to drive the state machine.
+#
+sub create_incomplete_folder_selstud_helper {
+    my ($helper, $map)  = @_;
+
+
+    my $symbFilter = '$res->shown_symb()';
+    my $selFilter   = '$res->is_problem()';
+
+
+    my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_PEOPLE_SEQ',
+						      'Select problem(s) to print',
+						      'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+						      'RESOURCES',
+						      'CHOOSE_STUDENTS_INCOMPLETE',
+						      $map,
+						      $selFilter,
+						      '',
+						      $symbFilter, 
+						      '');
+
+    my $student_chooser = &generate_student_chooser('CHOOSE_STUDENTS_INCOMPLETE',
+						 'student_sort',
+						 'STUDENTS',
+						 'CHOOSE_STUDENTS_INCOMPLETE_FORMAT');
+
+    my $format_chooser = &generate_format_selector($helper,
+						'Format of the print job',
+						'CHOOSE_STUDENTS_INCOMPLETE_FORMAT'); # end state.
+
+    return $resource_chooser . $student_chooser . $format_chooser;
+}  
+
+
+# BZ 5209
+#     Create the states needed to run the helper for incomplete problems from
+#     the current folder for selected students.
+#     This includes:
+#     - A resource selector limited to problems.  (incompleteness must be calculated
+#       on a student per student basis.
+#     - A student selector.
+#     - Tie in to format for the print job.
+# States:
+#    INCOMPLETE_PROBLEMS_COURSE_RESOURCES - Resource selector.
+#    INCOMPLETE_PROBLEMS_COURSE_STUDENTS  - Student selector.
+#    INCOMPLETE_PROBLEMS_COURSE_FORMAT    - Format selection.
+#
+# Parameters:
+#   helper   - Helper we are creating states for.
+# Returns:
+#   Text that can be parsed by the helper.
+# 
+
+sub create_incomplete_course_helper {
+    my $helper = shift;
+
+    my $filter = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
+    my $symbfilter = '$res->shown_symb()';
+    
+    my $resource_chooser = &generate_resource_chooser('INCOMPLETE_PROBLEMS_COURSE_RESOURCES',
+						      'Select problem(s) to print',
+						      'multichoice = "1" suppressEmptySequences="0" addstatus="1" closeallpagtes="1"',
+						      'RESOURCES',
+						      'INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
+						      '',
+						      $filter,
+						      '',
+						      $symbfilter,
+						      '');
+
+    my $people_chooser  = &generate_student_chooser('INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
+						    'student_sort',
+						    'STUDENTS',
+						    'INCOMPLETE_PROBLEMS_COURSE_FORMAT');
+
+    my $format = &generate_format_selector($helper,
+					   'Format of the print job',
+					   'INCOMPLETE_PROBLEMS_COURSE_FORMAT'); # end state.
+
+    return $resource_chooser . $people_chooser . $format;
+
+
+}
+
+# BZ5209 
+#   Creates the states needed to run the print helper for a student
+#   that wants to print his incomplete problems from the current folder.
+# Parameters:
+#   $helper - helper we are generating states for.
+#   $map    - The map for which the student wants incomplete problems.
+# Returns:
+#   XML that defines the helper states being created.
+#
+# States:
+#   CHOOSE_INCOMPLETE_SEQ  - Resource selector.
+#
+sub create_incomplete_folder_helper {
+    my ($helper, $map) = @_;
+
+    my $filter    = '$res->is_problem()';
+    $filter      .= ' && $res->resprintable() ';
+    $filter      .= ' && $res->is_incomplete() ';
+
+    my $symfilter = '$res->shown_symb()';
+
+    my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_SEQ',
+						      'Select problem(s) to print',
+						      'multichoice="1", toponly ="1", addstatus="1", closeallpages="1"',
+						      'RESOURCES',
+						      'PAGESIZE',
+						      $map,
+						      $filter, '', 
+						      $symfilter,
+						      '');
+
+    return $resource_chooser;
+}
+
+
+#  Returns the text neded for a student chooser.
 #  that text must still be parsed by the helper xml parser.
 # Parameters:
 #   this_state   - State name of the chooser.
@@ -164,7 +352,6 @@ CHOOSE_RESOURCES
       </resource>
     </state>
 CHOOSE_RESOURCES
-
     return $result;
 }
 #
@@ -196,14 +383,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>
@@ -212,7 +404,7 @@ sub generate_code_selector {
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
     <message></td></tr><tr><td></message>
-    <message><b>Bubble sheet type:</b></message>
+    <message><b>Bubblesheet type:</b></message>
     <message></td><td></message>
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
     $bubble_types
@@ -228,6 +420,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.
 	   }
@@ -249,8 +443,344 @@ CHOOSE_ANON1
    return $result;
 }
 
+#  Returns the XML for choosing how assignments are to be formatted 
+#  that text must still be parsed by the helper xml parser.
+# Parameters: 3 (required)
+
+#   helper       - The helper; $helper->{'VARS'}->{'PRINT_TYPE'} used
+#                  to check if splitting PDFs by section can be offered.
+#   title        - Title for the current state. 
+#   this_state   - State name of the chooser.
+
+sub generate_format_selector {
+    my ($helper,$title,$this_state) = @_;
+    my $secpdfoption;
+    unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
+            ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
+            ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
+        $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</choice>';
+    }
+    return <<RESOURCE_SELECTOR;
+    <state name="$this_state" title="$title">
+    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+    <choices variable="EMPTY_PAGES">
+      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
+    </choices>
+    <nextstate>PAGESIZE</nextstate>
+    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
+    <choices variable="SPLIT_PDFS">
+       <choice computer="all">All assignments in a single PDF file</choice>
+       $secpdfoption
+       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+            Specify the number of assignments per PDF:</choice>
+    </choices>
+    </state>
+RESOURCE_SELECTOR
+}
+
 #-----------------------------------------------------------------------
 
+# Computes an open and close date from a list of open/close dates for a resource's
+# parts.
+#
+# @param \@opens - reference to an array of open dates.
+# @param \@closes - reference to an array of close dates.
+#
+# @return ($open, $close) 
+#
+# @note If open/close dates are not defined they will be returned as undef
+# @note It is possible for there to be no overlap in which case -1,-1 
+#       will be returned.
+# @note The algorithm used is to take the latest open date and the earliest end date.
+#
+sub compute_open_window {
+    my ($opensref, $closesref) = @_;
+
+    my @opens   = @$opensref;
+    my @closes  = @$closesref;
+
+    # latest open date:
+    my $latest_open;
+
+    foreach my $open (@opens) {
+	if (!defined($latest_open) || ($open > $latest_open)) {
+	    $latest_open = $open;
+	}
+    }
+    # Earliest close:
+
+    my $earliest_close;
+    foreach my $close (@closes) {
+	if (!defined($earliest_close) || ($close < $earliest_close)) {
+	    $earliest_close = $close;
+	}
+    }
+
+    # If no overlap...both are -1 as promised.
+
+    if (($earliest_close ne '') && ($latest_open ne '')
+	 && ($earliest_close < $latest_open)) {
+	$latest_open  = -1;
+	$earliest_close = -1;
+    }
+    
+    return ($latest_open, $earliest_close);
+  
+}
+
+##
+#  Determines if 'now' is within the set of printable dates.
+#
+#  @param $open_date - Starting date/timestamp.
+#  @param $close_date - Ending date/timestamp.
+#
+#  @return 0 - Not open.
+#  @return 1 - open.
+#
+sub printable {
+    my ($open_date, $close_date) = @_;
+
+
+    my $now = time();
+
+    # Have to do a bit of fancy footwork around undefined open/close dates:
+
+    if ($open_date && ($open_date > $now)) {
+	return 0;
+    }
+
+    if ($close_date && ($close_date < $now)) {
+	return 0;
+    }
+    
+    return 1;
+
+}
+
+##
+# Returns the innermost print start/print end dates for a resource.
+# This is done by looking at the start/end dates for its parts and choosing
+# the intersection of those dates.
+# 
+# @param res - lonnvamaps::resource object that represents the resource.
+#
+# @return (opendate, closedate)
+#
+# @note If open/close dates are not defined they will be returned as undef
+# @note It is possible for there to be no overlap in which case -1,-1 
+#       will be returned.
+# @note The algorithm used is to take the latest open date and the earliest end date.
+#       For consistency with &printable() in lonnavmaps.pm determination of start
+#       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();
+    my @parts;
+    if (ref($partsref) eq 'ARRAY') {
+        @parts   = @{$partsref};
+    }
+    my $open_date;
+    my $close_date;
+    my @open_dates;
+    my @close_dates;
+
+
+    if (@parts) {
+	foreach my $part (@parts) {
+	    my $partopen  = $res->parmval('printstartdate', $part);
+	    my $partclose = $res->parmval('printenddate',  $part);
+            if (!$partopen) {
+                $partopen = $res->parmval('opendate',$part);
+            }
+            if (!$partopen) {
+                $partopen = $res->parmval('contentopen',$part);
+            }
+            if ($partopen) {
+                push(@open_dates, $partopen);
+            }
+            if ($partclose) {
+                push(@close_dates, $partclose);
+            }
+	    push(@open_dates, $partopen);
+	    push(@close_dates, $partclose);
+	}
+    }
+
+    ($open_date, $close_date)  = &compute_open_window(\@open_dates, \@close_dates);
+
+    return ($open_date, $close_date);
+}
+
+##
+# Get the dates for which a course says a resource can be printed.  This is like
+# get_print_dates but namvaps::course_print_dates are gotten...and not converted
+# to times either.
+#
+# @param $res - Reference to a resource has from lonnvampas::resource.
+#
+# @return (opendate, closedate)
+#
+sub course_print_dates {
+    my $res = shift;
+    my $partsref = $res->parts();
+    my @parts    = @$partsref;
+    my $open_date;
+    my $close_date;
+    my @open_dates;
+    my @close_dates;
+    my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.
+
+    # Don't bother looping over undefined or empty parts arraY;
+
+    if (@parts) {
+	foreach my $part (@parts) {
+	    my ($partopen, $partclose) = $navmap->course_printdates($res, $part);
+	    push(@open_dates, $partopen);
+	    push(@close_dates, $partclose);
+	}
+	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
+    }
+    return ($open_date, $close_date);
+}
+##
+# Same as above but for the enclosing map:
+#
+sub map_print_dates {
+    my $res = shift;
+    my $partsref = $res->parts();
+    my @parts    = @$partsref;
+    my $open_date;
+    my $close_date;
+    my @open_dates;
+    my @close_dates;
+    my $navmap = $res->{NAV_MAP}; # slightly OO dirty.
+
+
+    # Don't bother looping over undefined or empty parts arraY;
+
+    if (@parts) {
+	foreach my $part (@parts) {
+	    my ($partopen, $partclose) = $navmap->map_printdates($res, $part);
+	    push(@open_dates, $partopen);
+	    push(@close_dates, $partclose);
+	}
+	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
+    }
+    return ($open_date, $close_date);
+}
+
+# Determine if a resource is incomplete given the map:
+# Parameters:
+#   $username - Name of user for whom we are checking.
+#   $domain   - Domain of user we are checking.
+#   $map - map name.
+# Returns:
+#     0 - map is not incomplete.
+#     1 - map is incomplete.
+#
+sub incomplete {
+    my ($username, $domain, $map) = @_;
+
+
+    my $navmap = Apache::lonnavmaps::navmap->new($username, $domain);
+    
+
+    if (defined($navmap)) {
+	my $res = $navmap->getResourceByUrl($map);
+	my $result = $res->is_incomplete();
+	return $result;
+    } else {
+	return 1;
+    }
+}
+#
+#  When printing for students, the resoures and order of the
+#  resources may need to be altered if there are folders with
+#  random selectiopn or random ordering (or both) enabled.
+#  This sub computes the set of resources to print for a student
+#  modified both by random ordering and selection and filtered
+#  to only those that are in the original set selcted to be printed.
+#
+# Parameters:
+#   $map - The URL of the folder being printed.
+#          Used to determine which startResource and finishResource
+#          to use when using the navmap's getIterator method.
+#   $seq   - The original set of resources to print.
+#            (really an array of resource names (array of symb's).
+#   $who   - Student/domain for whome the sequence will be generated.
+#   $code  - CODE being printed when printing Problems/Resources
+#            from folder for CODEd assignments
+#
+# Implicit inputs:
+#   $
+# Returns:
+#   reference to an array of resources that can be passed to
+#   print_resources.
+# 
+sub master_seq_to_person_seq {
+    my ($map, $seq, $who, $code, $nohidemap) = @_;
+
+
+    my ($username, $userdomain, $usersection) = split(/:/, $who);
+
+    # Toss the sequence up into a hash so that we have O(1) lookup time.
+    # on the items that come out of the user's list of resources.
+    #
+
+    my %seq_hash = map {$_  => 1} @$seq;
+    my @output_seq;
+
+    my $unhidden;
+    if ($perm{'pav'} && $perm{'vgr'} && $nohidemap) {
+        $unhidden = &Apache::lonnet::clutter($map);
+    }
+    
+    my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
+                                                           $code, $unhidden);
+    my ($start,$finish);
+
+    if ($map) {
+        my $mapres = $navmap->getResourceByUrl($map);
+        if ($mapres->is_map()) {
+            $start = $mapres->map_start();
+            $finish = $mapres->map_finish();
+        }
+    }
+    unless ($start && $finish) {
+        $start = $navmap->firstResource();
+        $finish = $navmap->finishResource();
+    }
+
+    my $iterator         = $navmap->getIterator($start,$finish,{},1);
+
+    #  Iterate on the resource..select the items that are randomly selected
+    #  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})) {
+                push(@output_seq, $currsymb);
+	    }
+	}
+    }
+
+    return \@output_seq;		# for now.
+    
+}
+
 
 # Fetch the contents of a resource, uninterpreted.
 # This is used here to fetch a latex file to be included
@@ -306,7 +836,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;
 
@@ -346,9 +883,10 @@ sub include_pdf {
     # (unlikely).  If it did exist, add the pdf to the set of files/images that
     # need tob e converted for this print job:
 
-    $file =~ s|(.*)/res/|/home/httpd/html/res/|;
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+    $file =~ s{(.*)/res/}{$londocroot/res/};
 
-    open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+    open(FILE,">>$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
     print FILE ("$file\n");
     close (FILE);
 
@@ -371,7 +909,29 @@ sub include_pdf {
 
 
 }
-
+##
+#  Collect the various \select_language{language_name}
+#  latex tags to build a \usepackage[lang-list]{babel} which will
+#  appear just prior to the \begin{document} at the front of the concatenated
+#  set of resources:
+# @param doc - The string of latex to search/replace.
+# @return string
+# @retval - the modified document stringt.
+#
+sub collect_languages {
+    my $doc = shift;
+    my %languages;
+    while ($doc =~ /\\selectlanguage{(\w+)}/mg) {
+	$languages{$1} = 1;	# allows us to request each language exactly once.
+    }
+    my @lang_list = (keys(%languages)); # List of unique languages
+    if (scalar @lang_list) {
+	my $babel_header = '\usepackage[' . join(',', @lang_list) .']{babel}'. "\n";
+	$doc =~ s/\\begin{document}/$babel_header\\begin{document}/;
+    }
+    return $doc;
+}
+#-------------------------------------------------------------------
 
 #
 #   ssi_with_retries- Does the server side include of a resource.
@@ -418,7 +978,6 @@ sub ssi_with_retries {
 	$ssi_last_error_resource = $resource;
 	$ssi_last_error          = $response->code . " " . $response->message;
         $content='\section*{!!! An error occurred !!!}';	
-	&Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
     }
 
     return $content;
@@ -434,7 +993,6 @@ sub get_student_view_with_retries {
         $ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
         $ssi_last_error          = $response->code . " " . $response->message;
         $content='\section*{!!! An error occurred !!!}';
-        &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
     }
     return $content;
 
@@ -551,7 +1109,7 @@ sub format_page_header {
     # 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 ');
+        my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
         $format =~ s/\\\\\s\\\\\s/$testPrintout/;
     }
     #
@@ -689,6 +1247,22 @@ sub is_code_valid {
     }
 
 }
+#
+# Compare two students by section (Used to sort by section).
+#
+#  Implicit inputs, 
+#    $a - The first one
+#    $b - The second one.
+#
+#  Returns:
+#     a-section cmp b-section
+#
+sub compare_sections {
+    my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
+    my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
+
+    return $s1 cmp $s2;
+}
 
 #   Compare two students by name.  The students are in the form
 #   returned by the helper:
@@ -1309,7 +1883,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 /;}
@@ -1491,6 +2071,7 @@ sub unsupported {
     my $result.= &print_latex_header($mode);
     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
 	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
+        $currentURL=~s|^http://https://|https://|;
 	my $title=&Apache::lonnet::gettitle($symb);
 	$title = &Apache::lonxml::latex_special_symbols($title);
 	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
@@ -1516,6 +2097,7 @@ sub map_laystyle {
 
 sub print_page_in_course {
     my ($helper, $rparmhash, $currentURL, $resources) = @_;
+
     my %parmhash       = %$rparmhash;
     my @page_resources = @$resources;
     my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
@@ -1540,7 +2122,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 .= '\\\\';
 
@@ -1567,11 +2151,15 @@ sub print_page_in_course {
 	    my @page_resources = $navmap->retrieveResources($resource_src);
 	    $result           .= &print_page_in_course($helper, $rparmhash, 
 						       $resource_src, \@page_resources);
+        } elsif ($resource->ext()) {
+            $result .= &unsupported($currentURL,$mode,$symb);
 	}
 	# 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 +2169,7 @@ sub print_page_in_course {
 
 	    $form{'grade_target'}  = 'tex';
 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-	    $form{'pdfFormFiels'} = $pdfFormFields; # 
+	    $form{'pdfFormFields'} = $pdfFormFields; # 
 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
 	    
 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -1633,10 +2221,9 @@ sub print_page_in_course {
 			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    } else {
-			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-			my $URLpath=$urlp;
-			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
-			$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
+			$texversion.='\vskip 0 mm \noindent\textbf{'.
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
+			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		}
@@ -1685,8 +2272,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 +2306,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 +2317,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 +2328,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;
 }
 
 #
@@ -1757,7 +2343,7 @@ sub recently_generated {
 #
 #
 # use Data::Dumper;
-#sub dump_helper_vars {
+# sub dump_helper_vars {
 #    my ($helper) = @_;
 #    my $helpervars = Dumper($helper->{'VARS'});
 #    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");
@@ -1772,6 +2358,122 @@ sub get_page_breaks  {
     }
     return %page_breaks;
 }
+# 
+#   Returns text to insert for any extra vskip prior to the resource.
+#   Parameters:
+#     helper   - Reference to the helper object driving the printout.
+#     resource - Identifies the resource about to be printed.
+#
+#   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.
+#
+#   In order to speed this up for lengthy printouts, the first time,
+#   POSSIBLE_RESOURCES is turned into a look up hash and
+#   EXTRASPACE is turned into an array.
+#
+
+
+my %possible_resources;
+my %extraspace_mm;
+my @extraspace;
+my $skips_loaded       = 0;
+
+#  Function to load the skips hash and array
+
+sub load_skips {
+
+    my ($helper)  = @_;
+
+    #  If this is the first time, unrap the resources and extra spaces:
+
+    if (!$skips_loaded) {
+	@extraspace = (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'}));
+	my @resource_list = (split(/\|\|\|/, $helper->{'VARS'}->{'POSSIBLE_RESOURCES'}));
+	my $i = 0;
+	foreach my $resource (@resource_list) {
+	    $possible_resources{$resource} = $i;
+	    $i++;
+	}
+	foreach my $mm_resource (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE_UNITS'})) {
+	    $extraspace_mm{$mm_resource} = 1;
+	}
+	$skips_loaded = 1;
+    }
+}
+
+sub get_extra_vspaces {
+    my ($helper, $resource) = @_;
+
+    &load_skips($helper);
+
+    #  Lookup the resource in the possible resources hash.. that is the index
+    # into the extraspace array that gives us either an empty string or
+    # the number of mm to skip:
+
+    my $index = $possible_resources{$resource};
+    my $skip  = $extraspace[$index];
+
+    my $result = '';
+    if ($skip ne '') {
+	my $units = 'in';
+	if (defined($extraspace_mm{$resource})) {
+	    $units = 'mm';
+	}
+	$result = '\vskip '.$skip.' '.$units;
+    }
+
+	
+    return $result;
+
+
+}
+
+#
+#  The resource chooser part of the helper needs more than just
+#  the value of the extraspaces var to recover the value into a text
+#  field option.  This sub produces the required format for the saved var:
+#  specifically 
+#    ||| separated fields of the form resourcename=value
+#
+#  Parameters:
+#    $helper     - Refers to the helper we are configuring
+#  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.extraspace'}
+#     $env{'form.extraspace_units'}
+#
+sub set_form_extraspace {
+    my ($helper) = @_;
+
+    # the most convenient way to do this is to drive from the skips arrays/hash.
+    # may not be the fastest, but this is once per print request so it's not so
+    # speed critical:
+
+    &load_skips($helper);
+
+    my $result = '';
+
+    foreach my $resource (keys(%possible_resources)) {
+	my $vskip = $extraspace[$possible_resources{$resource}];
+	$result  .= $resource .'=' . $vskip . '|||';
+    }
+
+    $env{'form.extraspace'}  = $result;
+    $env{'form.extraspace_units'} = $helper->{'VARS'}->{'EXTRASPACE_UNITS'};
+    return $result;
+    
+}
 
 #  Output a sequence (recursively if neeed)
 #  from construction space.
@@ -1788,17 +2490,20 @@ sub get_page_breaks  {
 #
 sub print_construction_sequence {
     my ($currentURL, $helper, %form, $LaTeXwidth) = @_;
+
     my $result;
     my $rndseed=time;
     if ($helper->{'VARS'}->{'curseed'}) {
 	$rndseed=$helper->{'VARS'}->{'curseed'};
     }
-    my $errtext=&LONCAPA::map::mapread($currentURL);
+    my $errtext=&LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$currentURL));
+
     # 
     #  These make this all support recursing for subsequences.
     #
     my @order    = @LONCAPA::map::order;
     my @resources = @LONCAPA::map::resources; 
+
     for (my $member=0;$member<=$#order;$member++) {
 	$resources[$order[$member]]=~/^([^:]*):([^:]*):/;
 	my $urlp=$2;
@@ -1814,7 +2519,7 @@ sub print_construction_sequence {
 	    }
 	    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
-	       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+	       ($urlp=~/$LONCAPA::assess_page_re/)) {
 		#  Don't permanently modify %$form...
 		my %answerform = %form;
 		$answerform{'grade_target'}='answer';
@@ -1858,14 +2563,7 @@ sub print_construction_sequence {
 	    # IF sequence, recurse:
 	    
 	    if ($urlp =~ /\.sequence$/) {
-		my $sequence_url = $urlp;
-		my $domain       = $env{'user.domain'};	# Constr. space only on local
-		my $user         = $env{'user.name'};
-
-		$sequence_url    =~ s/^\/res\/$domain/\/home/;
-		$sequence_url    =~ s/^(\/home\/$user)/$1\/public_html/;
-#		$sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
-		$result .= &print_construction_sequence($sequence_url, 
+		$result .= &print_construction_sequence($urlp, 
 							$helper, %form, 
 							$LaTeXwidth);
 	    }
@@ -1889,12 +2587,45 @@ sub print_construction_sequence {
     return $result;
 }
 
+#
+#  Top level for generating print output.
+#
+#  May call print_resources if multiple resources will be printed.
+#
+#  The main driver is $selectionmade which reflects the type of print out
+#  requested:
+#   Value    Print type:
+#   1        Print resource that's being looked at.
+#   2        Print problems in a map or in a page.
+#   3        Print pages in a map or resources in a page.
+#   4        Print all problems  or all resources.
+#   5        Print problems for seleted students.
+#   6        Print selected problems from a folder.
+#   7        Print print selected resources from some scope.
+#   8        Print resources for selected students.
+#
+#BZ 5209
+#   2        map_incomplete_problems_seq Print incomplete problems from the current
+#            folder in student context.
+#   5      map_incomplete_problems_people_seq Print incomplete problems from the
+#            current folder in privileged context.
+#    5      incomplete_problems_selpeople_course Print incomplete problems for
+#            selected people from the entire course.
+#
+#   Item 101 has much the same processing as 8,
+#
+#  Differences:  Item 101, 102 require per-student filtering of the resource
+#  set so that only the incomplete resources are printed.
+#  For item 100, filtering was done at the helper level.
+
 sub output_data {
+
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
     $ssi_error = 0;		# This will be set nonzero by failing ssi's.
     $resources_printed = '';
     $font_size = $helper->{'VARS'}->{'fontsize'};
+    my $print_type = $helper->{'VARS'}->{'PRINT_TYPE'}; # Allows textual simplification.
     my $do_postprocessing = 1;
     my $js = <<ENDPART;
 <script type="text/javascript">
@@ -1943,11 +2674,13 @@ ENDPART
     # indexed by symb and contains 1's for each break.
 
     $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
-    $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'}; 
+    &set_form_extraspace($helper);
+    $env{'form.lastprinttype'} = $print_type; 
     &Apache::loncommon::store_course_settings('print',
 					      {'pagebreaks'    => 'scalar',
+					       'extraspace'    => 'scalar',
+					       'extraspace_units' => 'scalar',
 					       'lastprinttype' => 'scalar'});
-
     my %page_breaks  = &get_page_breaks($helper);
 
     my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
@@ -1992,8 +2725,7 @@ ENDPART
 	&Apache::lonnet::delenv('construct.style');
     }
 
-
-    if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
+    if ($print_type eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
 
@@ -2004,11 +2736,11 @@ ENDPART
 	} else {
 
             #prints resource from the construction space
-	    $currentURL='/'.$helper->{'VARS'}->{'filename'};
-	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
+	    $currentURL=$helper->{'VARS'}->{'filename'};
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
+      
 	if ($cleanURL!~m|^/adm/|
 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
@@ -2048,6 +2780,7 @@ ENDPART
 
 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
@@ -2069,10 +2802,10 @@ ENDPART
 			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    } else {
-			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-			my $URLpath=$cleanURL;
-			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
-			$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
+			$texversion.='\vskip 0 mm \noindent\textbf{'.
+                        &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
+
+			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		}
@@ -2104,11 +2837,6 @@ ENDPART
 	    }
         } elsif ($cleanURL!~m|^/adm/|
 		 && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
-            #printing content of sequence from the construction space	
-
-
-	    $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
-#	    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
 	    $result .= &print_construction_sequence($currentURL, $helper, %form,
 						    $LaTeXwidth);
 	    $result .= '\end{document}';  
@@ -2120,8 +2848,7 @@ ENDPART
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
 		$resources_printed .= $currentURL.':';
-		my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-		$texversion .= &ssi_with_retries($currentURL, $ssi_retry_count, %form);
+		my $texversion = &ssi_with_retries($currentURL, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 		    my $annotation = &annotate($currentURL);
 		    $texversion    =~ s/(\\end{document})/$annotation$1/;
@@ -2154,36 +2881,37 @@ ENDPART
 
        
 	} else {
-	    &Apache::lonnet::logthis("Unsupported type handler");
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
 				  $helper->{'VARS'}->{'symb'});
 	}
-    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') or
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page') or
-             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
-             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
-	     ) { 
-
-
+    } elsif (($print_type eq 'map_problems')          or
+	     ($print_type eq 'map_problems_in_page')  or
+	     ($print_type eq 'map_resources_in_page') or
+             ($print_type eq 'map_problems_pages')    or
+             ($print_type eq 'all_problems')          or
+	     ($print_type eq 'all_resources')         or # BUGBUG
+	     ($print_type eq 'select_sequences')      or
+	     ($print_type eq 'map_incomplete_problems_seq')
+	     ) {
+ 
         #-- produce an output string
-	if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')  or
-	    ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {
+	if (($print_type eq 'map_problems')                or
+	    ($print_type eq 'map_incomplete_problems_seq') or
+	    ($print_type eq 'map_problems_in_page') ) {
 	    $selectionmade = 2;
-	} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
-		 ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page'))
+	} elsif (($print_type eq 'map_problems_pages') or
+		 ($print_type eq 'map_resources_in_page'))
 	{
 	    $selectionmade = 3;
-	} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') 
+	} elsif (($print_type eq 'all_problems') 
 		 ) {
 	    $selectionmade = 4;
-	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
+	} elsif ($print_type eq 'all_resources') {  #BUGBUG
 	    $selectionmade = 4;
-	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
+	} elsif ($print_type eq 'select_sequences') {
 	    $selectionmade = 7;
 	}
+
 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -2214,6 +2942,7 @@ ENDPART
 		    $result.="\\newpage\n";
 		}
 	    }
+	    $result .= &get_extra_vspaces($helper, $master_seq[$i]);
 	    my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    $urlp=&Apache::lonnet::clutter($urlp);
 	    $form{'symb'}=$master_seq[$i];
@@ -2227,14 +2956,23 @@ ENDPART
 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 		$resources_printed .= $urlp.':';
 		&Apache::lonxml::remember_problem_counter();
-		$texversion.=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  # RF
+		if ($flag_latex_header_remove eq 'NO') {
+		    $texversion.=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  # RF
+                    unless (($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') ||
+                            (($i==0) &&
+                             (($urlp=~/\.page$/) ||
+                              ($print_type eq 'map_problems_in_page') ||
+                              ($print_type eq 'map_resources_in_page')))) {
+                        $flag_latex_header_remove = 'YES';
+                    }
+		}
 		$texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($urlp=~/\.page$/) {
 		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
 		    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')) {
@@ -2246,13 +2984,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=~/$LONCAPA::assess_page_re/) {
 			    $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 ';
@@ -2288,7 +3035,6 @@ ENDPART
 							  $assignment, 
 							  $courseidinfo, 
 							  $name);
-
 		    if ($numberofcolumns eq '1') {
 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
 		    } else {
@@ -2301,8 +3047,7 @@ ENDPART
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		$resources_printed .= $urlp.':';
-		my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-		$texversion .= &ssi_with_retries($urlp, $ssi_retry_count, %form);
+		my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
 		    my $annotation = &annotate($urlp);
 		    $texversion =~ s/(\\end{document)/$annotation$1/;
@@ -2319,7 +3064,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';
@@ -2342,7 +3091,7 @@ ENDPART
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    }	    
+	    }
 	    if (&Apache::loncommon::connection_aborted($r)) { 
 		last; 
 	    }
@@ -2352,20 +3101,24 @@ ENDPART
 	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
 	}	
 	$result .= '\end{document}';
-     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
+     } elsif (($print_type eq 'problems_for_students')           ||
+	      ($print_type eq 'problems_for_students_from_page') ||
+	      ($print_type eq 'all_problems_students')           ||
+	      ($print_type eq 'resources_for_students')          ||
+	      ($print_type eq 'incomplete_problems_selpeople_course') ||
+	      ($print_type eq 'map_incomplete_problems_people_seq')){
 
 
      #-- prints assignments for whole class or for selected students  
 	 my $type;
-	 if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {
+	 if (($print_type eq 'problems_for_students')           ||
+	     ($print_type eq 'problems_for_students_from_page') ||
+	     ($print_type eq 'all_problems_students')           ||
+	     ($print_type eq 'incomplete_problems_selpeople_course') ||
+	     ($print_type eq 'map_incomplete_problems_people_seq')) {
 	     $selectionmade=5;
 	     $type='problems';
-	 } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
+	 } elsif ($print_type eq 'resources_for_students') {
 	     $selectionmade=8;
 	     $type='resources';
 	 }
@@ -2382,6 +3135,8 @@ ENDPART
 	 if (($helper->{'VARS'}->{'student_sort'}    eq 1)  && 
 	     ($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
 	     @students = sort compare_names  @students;
+	 } else {
+	     @students = sort compare_sections @students; 
 	 }
 	 &adjust_number_to_print($helper);
 
@@ -2400,6 +3155,12 @@ ENDPART
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 
+         my $map;
+         if ($helper->{VARS}->{'symb'}) {
+             ($map, my $id, my $resource) =
+                 &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
+         }
+
 	 #loop over students
 
  	 my $flag_latex_header_remove = 'NO';
@@ -2414,12 +3175,11 @@ ENDPART
 	     ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
 	     $moreenv{'problem_split'}='yes';
 	 }
-	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
+	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$#students+1);
 	 my $student_counter=-1;
 	 my $i = 0;
 	 my $last_section = (split(/:/,$students[0]))[2];
 	 foreach my $person (@students) {
-
              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	     if (-e $duefile) {
 		 my $temp_file = Apache::File->new('>>'.$duefile);
@@ -2435,23 +3195,26 @@ ENDPART
 	     } else {
 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
 	     }
+	     my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+                                                       $person, undef, 1);
 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
-						     \%moreenv,\@master_seq,
+						     \%moreenv,  $actual_seq,
 						     $flag_latex_header_remove,
 						     $LaTeXwidth);
 	     $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; }
 	 }
 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	 $result .= $print_array[0].'  \end{document}';
-     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
-	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) { 
+     } elsif (($print_type eq 'problems_for_anon')      ||
+	      ($print_type eq 'problems_for_anon_page') ||
+	      ($print_type eq 'resources_for_anon')  ) { 
 	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
 	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
@@ -2459,20 +3222,39 @@ ENDPART
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
-
 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
          my @lines = &Apache::grades::get_scantronformat_file();
-	 my ($code_type,$code_length)=('letter',6);
+	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
 	 foreach my $line (@lines) {
-	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
+             chomp($line);
+	     my ($name,$type,$length,$bubbles_per_item) = 
+                 (split(/:/,$line))[0,2,4,17];
 	     if ($name eq $code_option) {
 		 $code_length=$length;
 		 if ($type eq 'number') { $code_type = 'number'; }
+                 chomp($bubbles_per_item); 
+                 if (($bubbles_per_item ne '') && ($bubbles_per_item > 0)) {
+                     $bubbles_per_row = $bubbles_per_item; 
+                 }
 	     }
 	 }
+         my ($randomorder,$randompick,$map);
+         if ($helper->{VARS}{'symb'}) {
+             ($map, my $id, my $resource) =
+                 &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
+             my $navmap = Apache::lonnavmaps::navmap->new();
+             if (defined($navmap)) {
+                 if ($map) {
+                     my $mapres = $navmap->getResourceByUrl($map);
+                     $randomorder = $mapres->randomorder();
+                     $randompick = $mapres->randompick();
+                 }
+             }
+         }
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
          $moreenv{'instructor_comments'}='hide';
+         $moreenv{'bubbles_per_row'} = $bubbles_per_row;
 	 my $seed=time+($$<<16)+($$);
 	 my @allcodes;
 	 if ($old_name) {
@@ -2513,14 +3295,15 @@ ENDPART
 	     @allcodes=keys(%allcodes);
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+	 my ($type) = split(/_/,$print_type);
 	 &adjust_number_to_print($helper);
 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
-	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
-	     $number_per_page=$num_todo;
+	 if ($number_per_page eq '0' || $number_per_page eq 'all'
+	     || $number_per_page eq 'section') {
+	     $number_per_page=$num_todo > 0 ? $num_todo : 1;
 	 }
 	 my $flag_latex_header_remove = 'NO'; 
-	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
+	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);
 	 my $count=0;
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
@@ -2529,9 +3312,17 @@ ENDPART
 	     } else {
 		 $moreenv{'CODE'}=&num_to_letters($code);
 	     }
+             my $actual_seq = \@master_seq;
+             if ($randomorder || $randompick) {
+                 $env{'form.CODE'} = $moreenv{'CODE'};
+                 $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+                                                        undef,
+                                                        $moreenv{'CODE'}, 1);
+                 delete($env{'form.CODE'});
+             }
 	     my ($output,$fullname, $printed)=
 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
-				  \@master_seq,$flag_latex_header_remove,
+				  $actual_seq,$flag_latex_header_remove,
 				  $LaTeXwidth);
 	     $resources_printed .= ":";
 	     $print_array[$file_num].=$output;
@@ -2543,7 +3334,7 @@ ENDPART
 	 }
 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 	 $result .= $print_array[0].'  \end{document}';
-     } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {      
+     } elsif ($print_type eq 'problems_from_directory') {      
     #prints selected problems from the subdirectory 
 	$selectionmade = 6;
         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
@@ -2562,11 +3353,7 @@ ENDPART
 	    if ($urlp=~/\//) {
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'rndseed'}=$rndseed;
-		if ($urlp =~ m|/home/([^/]+)/public_html|) {
-		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
-		} else {
-		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
-		}
+		$urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
 		$resources_printed .= $urlp.':';
 		my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
@@ -2587,19 +3374,16 @@ ENDPART
 			    $texversion.='\vskip 0 mm \noindent ';
 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			} else {
-			    $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-			    my $URLpath=$urlp;
-			    $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
-			    $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+			    $texversion.='\vskip 0 mm \noindent\textbf{'.
+                                         &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
+			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
 			}
 			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		    }
 		}
                 #this chunk is responsible for printing the path to problem
 
-		my $newurlp=$urlp;
-		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
-		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
+		my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
@@ -2625,7 +3409,13 @@ ENDPART
     # Only post process if that has not been turned off e.g. by a raw latex resource.
 
     if ($do_postprocessing) {
-	$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
+	$result = &page_format_transformation($papersize,
+					      $laystyle,$numberofcolumns,
+					      $print_type,$result,
+					      $helper->{VARS}->{'assignment'},
+					      $helper->{'VARS'}->{'TABLE_CONTENTS'},
+					      $helper->{'VARS'}->{'TABLE_INDEX'},
+					      $selectionmade);
 	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
 				     $helper->{'VARS'}->{'ANSWER_TYPE'});
 	#if ($numberofcolumns == 1) {
@@ -2642,12 +3432,7 @@ ENDPART
 
     my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} eq '1') {
-	#prints resource from the construction space
-	$URLback='/'.$helper->{'VARS'}->{'filename'};
-	if ($URLback=~/([^?]+)/) {
-	    $URLback=$1;
-	    $URLback=~s|^/~|/priv/|;
-	}
+	$URLback=$helper->{'VARS'}->{'filename'};
     }
     #
     # Final adjustment of the font size:
@@ -2655,6 +3440,11 @@ ENDPART
 
     $result = set_font_size($result);
 
+    # Insert any babel headers required.
+
+    $result       = &collect_languages($result);
+
+
 #-- writing .tex file in prtspool 
     my $temp_file;
     my $identifier = &Apache::loncommon::get_cgi_id();
@@ -2782,14 +3572,28 @@ sub print_resources {
     my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);
     my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
-    if ($person =~ 'anon') {
-	$namepostfix .="Name: ";
+
+
+    #
+    # Figure out if we need to filter the output by
+    # the incomplete problems for that person
+    #
+    my $print_type = $helper->{'VARS'}->{'PRINT_TYPE'};
+    my $print_incomplete = 0;
+    if (($print_type eq 'map_incomplete_problems_people_seq')   ||
+	($print_type eq 'incomplete_problems_selpeople_course')) {
+	$print_incomplete = 1;
+    }
+    if ($person eq 'anonymous') {
+	$namepostfix .=&mt('Name:')." ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+
     #  Fullname may have special latex characters that need \ prefixing:
     #
 
     my $i           = 0;
+    my $actually_printed = 0;	# Count of resources printed.
     #goes through all resources, checks if they are available for 
     #current student, and produces output   
 
@@ -2807,17 +3611,30 @@ sub print_resources {
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #
 
+    my $syllabus_first = 0;
+    my $current_assignment = "";
+    my $assignment;
+    my $courseidinfo = &get_course();
+
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
 	    if($i != 0) {
 		$current_output.= "\\newpage\n";
 	    }
 	}
+	$current_output .= &get_extra_vspaces($helper, $curresline);
 	$i++;
+	my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+
+	# See if we need to emit a new header:
 
 	if ( !($type eq 'problems' && 
-	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
-	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+	       ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
+	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
+		next;
+	    }
+	    $actually_printed++; # we're going to print one.
+
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
 		if ($res_url!~m|^ext/|
 		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
@@ -2825,11 +3642,26 @@ 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.
 			my %answerenv = %{$moreenv};
 			$answerenv{'answer_output_mode'}='tex';
+
+
 			$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 			
 			&Apache::lonxml::restore_problem_counter();
@@ -2842,7 +3674,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 ';
@@ -2865,6 +3699,9 @@ sub print_resources {
 		    }
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+		    if ($i == 1) {
+			$syllabus_first = 1;
+		    }
 		    $printed .= $curresline.':';
 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
@@ -2896,29 +3733,58 @@ sub print_resources {
 		}
 	    }
 	    $remove_latex_header = 'YES';
-	} 
+	}
+	$assignment = &Apache::lonxml::latex_special_symbols(
+	    &Apache::lonnet::gettitle($map), 'header');
+	if (($assignment ne $current_assignment) && ($assignment ne "")) {
+	    my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+						  $assignment, $courseidinfo, 
+						  $fullname, $usersection);
+	    my $header_start = ($columns_in_format == 1) ? '\lhead'
+		: '\fancyhead[LO]';
+	    $header_line = $header_start.'{'.$header_line.'}';
+	    $current_output = $current_output . $header_line;
+	    $current_assignment = $assignment;
+	}
+
 	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
+    # If we are printing incomplete it's possible we don't have
+    # anything to print.  The print subsystem is not so good at handling
+    # that so we're going to generate a stub that says there are no
+    # incomplete resources for the person.
+    #
 
+    if ($actually_printed == 0) {
+	$current_output  = &encapsulate_minipage("\\vskip -10mm \nNo incomplete resources\n \\vskip 100 mm { }\n");
+	if ($remove_latex_header eq "NO") {
+	    $current_output = &print_latex_header() . $current_output;
+	} else {
+	    $current_output = &latex_header_footer_remove($current_output);
+	}
+    }
 
-    my $courseidinfo = &get_course();
+    if ($syllabus_first) {
+        $current_output =~ s/\\\\ Last updated:/Last updated:/
+    }
     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);
-    my $header_start = ($columns_in_format == 1) ? '\lhead'
-	                                         : '\fancyhead[LO]';
-    $header_line = $header_start.'{'.$header_line.'}';
+    &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$header_line$namepostfix}\\vskip 5 mm /;
+	$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'};
-	    
+	
 	$current_output = '\strut\vspace*{-6 mm}\\newline'.
 	    &copyright_line().' \newpage '.$blankpages.$end_of_student.
 	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
-	    $header_line.$namepostfix.'} \vskip 5 mm '.$current_output;
+	    $newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
+
     }
     #
     #  Close the student bracketing.
@@ -2927,14 +3793,46 @@ sub print_resources {
 
 }
 
+sub printing_blocked {
+    my ($r,$blocktext) = @_;
+    my $title = &mt('Preparing Printout');
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/printout',
+                                            text=> $title});
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs($title);
+    &Apache::loncommon::content_type($r,'text/html');
+    &Apache::loncommon::no_cache($r);
+    $r->send_http_header;
+    $r->print(&Apache::loncommon::start_page('Preparing Printout').
+              $breadcrumbs.
+              $blocktext.
+              &Apache::loncommon::end_page());
+    return;
+}
+
 sub handler {
 
     my $r = shift;
+
+    if ($env{'request.course.id'}) {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my ($blocked,$blocktext) = 
+            &Apache::loncommon::blocking_status('printout',$cnum,$cdom);
+        if ($blocked) {
+            my $checkrole = "cm./$cdom/$cnum";
+            if ($env{'request.course.sec'} ne '') {
+                $checkrole .= "/$env{'request.course.sec'}";
+            }
+            unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) && 
+                    ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
+                &printing_blocked($r,$blocktext);
+                return OK;
+            }
+        }
+    }
     
     &init_perm();
-
-
-
     my $helper = printHelper($r);
     if (!ref($helper)) {
 	return $helper;
@@ -2958,7 +3856,7 @@ sub handler {
 
     &output_data($r,$helper,\%parmhash);
     return OK;
-} 
+}
 
 use Apache::lonhelper;
 
@@ -2983,6 +3881,11 @@ sub init_perm {
 	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     }
+    $perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+    if (!$perm{'vgr'}) {
+        $perm{'vgr'}=&Apache::lonnet::allowed('vgr',
+                   $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    }
 }
 
 sub get_randomly_ordered_warning {
@@ -2998,12 +3901,7 @@ sub get_randomly_ordered_warning {
 	    my $func = 
 	        sub { return ($_[0]->is_map() && $_[0]->randomorder); };
 	    my @matches = $navmap->retrieveResources($res, $func,1,1,1);
-	    if (@matches) {
-	        $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
-	    }
-        }
-        if ($message) {
-	    return '<message type="warning">'.$message.'</message>';
+
         }
     } else {
         $message = "Retrieval of information about ordering of resources failed."; 
@@ -3054,19 +3952,21 @@ sub printHelper {
     $helper->declareVar('PRINT_TYPE');
     $helper->declareVar("showallfoils");
     $helper->declareVar("STUDENTS");
-
+    $helper->declareVar("EXTRASPACE");
 
    
 
 
-    #  The page breaks can get loaded initially from the course environment:
+    #  The page breaks and extra spaces
+    #  can get loaded initially from the course environment:
     # But we only do this in the initial state so that they are allowed to change.
     #
 
-    # $helper->{VARS}->{FINISHPAGE} = '';
     
     &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
@@ -3076,18 +3976,23 @@ sub printHelper {
 	if (!defined ($env{"form.CURRENT_STATE"})) {
 	    
 	    $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'};
+		
 	    }
 	}
 	
     }
 
     # Detect whether we're coming from construction space
-    if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
-        $helper->{VARS}->{'filename'} = "~$1/$2";
+    if ($env{'form.postdata'}=~m{^/priv}) {
+        $helper->{VARS}->{'filename'} = $env{'form.postdata'};
         $helper->{VARS}->{'construction'} = 1;
     } else {
         if ($env{'form.postdata'}) {
@@ -3123,6 +4028,14 @@ sub printHelper {
     my ($map, $id, $url);
     my $subdir;
     my $is_published=0;		# True when printing from resource space.
+    my $res_printable = 1;	# By default the current resource is printable.    
+    my $userCanPrint = ($perm{'pav'} || $perm{'pfo'});
+    my $res_printstartdate;
+    my $res_printenddate;
+    my $map_open = 0;
+    my $map_close = 0xffffffff;
+    my $course_open = 0;
+    my $course_close = 0xffffffff;
 
     # Get the resource name from construction space
     if ($helper->{VARS}->{'construction'}) {
@@ -3137,7 +4050,16 @@ sub printHelper {
 	    ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
 	    $helper->{VARS}->{'postdata'} = 
 		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+	    my $navmap = Apache::lonnavmaps::navmap->new();
+	    my $res   = $navmap->getBySymb($symb);
+	    $res_printable  = $res->resprintable() || $userCanPrint; #printability in course context
+	    ($res_printstartdate, $res_printenddate) = 	&get_print_dates($res);
+	    ($course_open, $course_close) = &course_print_dates($res);
+	    ($map_open, $map_close)       = &map_print_dates($res);
+
 	} else {
+	    # Resource space.
+
 	    $url = $helper->{VARS}->{'postdata'};
 	    $is_published=1;	# From resource space.
 	}
@@ -3147,10 +4069,13 @@ sub printHelper {
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
         }
         $subdir = &Apache::lonnet::filelocation("", $url);
+
+
     }
     if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
 	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
     }
+
     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
 	$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
     }
@@ -3176,18 +4101,28 @@ sub printHelper {
     my $printChoices = [];
     my $paramHash;
 
-    if ($resourceTitle) {
+    # If there is a current resource and it is printable
+    # Give that as a choice.
+
+    if ($resourceTitle && $res_printable) {
         push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
-    }
+    } 
 
     # Useful filter strings
-    my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
+
+    my $isPrintable = ' && $res->resprintable()';
+
+    my $isProblem = '(($res->is_problem()||$res->contains_problem() ||$res->is_practice()))';
+    $isProblem .= $isPrintable unless $userCanPrint;
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
-    my $isNotMap = '!$res->is_sequence()';
+    my $isProblemOrMap = '($res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
+    $isProblemOrMap .= $isPrintable unless $userCanPrint;
+    my $isNotMap = '(!$res->is_sequence())';
+    $isNotMap .= $isPrintable unless $userCanPrint;
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
-    my $symbFilter = '$res->shown_symb()';
+    $isMap .= $isPrintable unless $userCanPrint;
+    my $symbFilter = '$res->shown_symb() ';
     my $urlValue = '$res->link()';
 
     $helper->declareVar('SEQUENCE');
@@ -3197,8 +4132,17 @@ sub printHelper {
     my $start_new_option;
     if ($perm{'pav'}) {
 	$start_new_option = 
-	    "<option text='".&mt('Start new page<br />before selected').
-	    "' variable='FINISHPAGE' />";
+	    "<option text='".&mt('Start new page[_1]before selected','<br />').
+	    "' variable='FINISHPAGE' />".
+	    "<option text='".&mt('Extra space[_1]before selected','<br />').
+	    "' variable='EXTRASPACE' type='text' />" .
+	    "<option " .
+	    "' variable='POSSIBLE_RESOURCES' type='hidden' />".
+	    "<option text='".&mt('Space units[_1]check for mm','<br />').
+	    "' variable='EXTRASPACE_UNITS' type='checkbox' />"
+	    ;
+	    
+
     }
 
     # If not construction space user can print the components of a page:
@@ -3258,43 +4202,91 @@ sub printHelper {
     if (($helper->{'VAR'}->{'construction'} ne '1' ) &&
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
+
+	# BZ 5209 - Print incomplete problems from sequence:
+	# the exact form of this depends on whether or not we are privileged or a mere
+	# plebe of s student:
+
+	my $printSelector = 'map_incomplete_problems_seq';
+	my $nextState     = 'CHOOSE_INCOMPLETE_SEQ';
+	my $textSuffix    = '';
+
+	if ($userCanPrint)  {
+	    $printSelector = 'map_incomplete_problems_people_seq';
+	    $nextState     = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';
+	    $textSuffix    = ' for selected students';
+	    my $helperStates =
+		&create_incomplete_folder_selstud_helper($helper, $map); 
+	    &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+	} else {
+	    if (&printable($map_open, $map_close)) {
+		my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
+		&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+	    } else {
+		# TODO: Figure out how to break the news...this folder is not printable.
+	    }
+	}
+
+	if ($userCanPrint || &printable($map_open, $map_close)) {
+	    push(@{$printChoices},
+		 [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
+		      '<b>', '</b>',
+		      '<b><i>'. $sequenceTitle . '</b></i>'),
+		  $printSelector,
+		  $nextState]);
+	}
         # Allow problems from sequence
-        push @{$printChoices}, 
+	if ($userCanPrint || &printable($map_open, $map_close)) {
+	    push @{$printChoices}, 
 	    [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
 	     'map_problems', 
 	     'CHOOSE_PROBLEMS'];
-        # Allow all resources from sequence
-        push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
-				'map_problems_pages', 
-				'CHOOSE_PROBLEMS_HTML'];
-        my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
-							'Select Problem(s) to print',
-							'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-							'RESOURCES',
-							'PAGESIZE',
-							$map,
-							$isProblem, '',
-							$symbFilter,
-							$start_new_option);
-	$helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
-						      'Select Resource(s) to print',
-						      	'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-						      'RESOURCES',
-						      'PAGESIZE',
-						      $map,
-						      $isNotMap, '',
-						      $symbFilter,
-						      $start_new_option);
-
-	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+	    # Allow all resources from sequence
+	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
+				    'map_problems_pages', 
+				    'CHOOSE_PROBLEMS_HTML'];
+	    my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
+							    'Select Problem(s) to print',
+							    'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+							    'RESOURCES',
+							    'PAGESIZE',
+							    $map,
+							    $isProblem, '',
+							    $symbFilter,
+							    $start_new_option);
+	    $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
+							  'Select Resource(s) to print',
+							  'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+							  'RESOURCES',
+							  'PAGESIZE',
+							  $map,
+							  $isNotMap, '',
+							  $symbFilter,
+							  $start_new_option);
+	    
+	    &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+	} else {
+	    # TODO: Figure out how to tell them the folder is not printable.
+	}
     }
-
-    # If the user has pfo (print for others) allow them to print all 
-    # problems and resources  in the entire course, optionally for selected students
-    my $post_data = $helper->{VARS}->{'postdata'};
+	# If the user has pfo (print for others) allow them to print all 
+	# problems and resources  in the entire course, optionally for selected students
+	my $post_data = $helper->{VARS}->{'postdata'};
+    
     if ($perm{'pfo'} &&  !$is_published  &&
         ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
+	# BZ 5209 - incomplete problems from entire course:
+
+	push(@{$printChoices},
+	     [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
+	      'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
+	my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
+
+	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+
+	#  Selected problems/resources from entire course:
+
         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
 	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
 	push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
@@ -3311,7 +4303,7 @@ my $suffixXml = <<ALL_PROBLEMS;
 ALL_PROBLEMS
          &Apache::lonxml::xmlparse($r, 'helper', 
 				   &generate_resource_chooser('ALL_PROBLEMS',
-							      'SelectProblem(s) to print',
+							      'Select Problem(s) to print',
 							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
 							      'RESOURCES',
 							      'PAGESIZE',
@@ -3360,7 +4352,7 @@ ALL_PROBLEMS
 	}
 
 	my $randomly_ordered_warning = 
-	    &get_randomly_ordered_warning($helper,$map);
+            &get_randomly_ordered_warning($helper, $map);
 
 	# resource_selector will hold a few states that:
 	#   - Allow resources to be selected for printing.
@@ -3376,30 +4368,13 @@ ALL_PROBLEMS
 							  'multichoice="1" addstatus="1" closeallpages="1"',
 							  'RESOURCES', 
 							  'PRINT_FORMATTING',
-							  '',
+							  $map,
 							  $isProblem, '', $symbFilter,
 							  $start_new_option);
-	$resource_selector .=  <<RESOURCE_SELECTOR;
-    <state name="PRINT_FORMATTING" title="How should results be printed?">
-    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
-    <choices variable="EMPTY_PAGES">
-      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
-      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
-      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
-      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-    </choices>
-    <nextstate>PAGESIZE</nextstate>
-    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
-    <choices variable="SPLIT_PDFS">
-       <choice computer="all">All assignments in a single PDF file</choice>
-       <choice computer="sections">Each PDF contains exactly one section</choice>
-       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
-            Specify the number of assignments per PDF:</choice>
-    </choices>
-    </state>
-RESOURCE_SELECTOR
-        $resource_selector .= &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
+	$resource_selector .=  &generate_format_selector($helper,
+                                                         'How should results be printed?',
+                                                         'PRINT_FORMATTING').
+                               &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
 							'Select Problem(s) to print',
 							"multichoice='1' addstatus='1' closeallpages ='1'",
 							'RESOURCES',
@@ -3471,6 +4446,7 @@ RESOURCE_SELECTOR
         my @lines = &Apache::grades::get_scantronformat_file();
 	my $codechoice='';
 	foreach my $line (@lines) {
+            next if (($line =~ /^\#/) || ($line eq ''));
 	    my ($name,$description,$code_type,$code_length)=
 		(split(/:/,$line))[0,1,2,4];
 	    if ($code_length > 0 && 
@@ -3509,6 +4485,9 @@ RESOURCE_SELECTOR
 
 
 	if ($helper->{VARS}->{'assignment'}) {
+
+	    # Assignment printing:
+
 	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
 	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
@@ -3527,28 +4506,11 @@ RESOURCE_SELECTOR
       $start_new_option
       </resource>
     </state>
-
-    <state name="PRINT_FORMATTING" title="Format of the print job">
-    <nextstate>NUMBER_PER_PDF</nextstate>
-    <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
-    <choices variable="EMPTY_PAGES">
-      <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
-      <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
-      <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
-      <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-    </choices>
-    <nextstate>PAGESIZE</nextstate>
-    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
-    <choices variable="SPLIT_PDFS">
-       <choice computer="all">All assignments in a single PDF file</choice>
-       <choice computer="sections">Each PDF contains exactly one section</choice>
-       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
-           Specify the number of assignments per PDF:</choice>
-    </choices>
-    </state>
 RESOURCE_SELECTOR
 
+        $resource_selector .= &generate_format_selector($helper,
+                                                        'Format of the print job',
+                                                        'PRINT_FORMATTING');
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
     <choices variable='student_sort'>
@@ -3569,7 +4531,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'}                &&
@@ -3577,6 +4539,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>
@@ -3585,7 +4551,7 @@ CHOOSE_STUDENTS1
     <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
     <message></td></tr><tr><td></message>
-    <message><b>Bubble sheet type:</b></message>
+    <message><b>Bubblesheet type:</b></message>
     <message></td><td></message>
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
     $codechoice
@@ -3600,6 +4566,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.
 	   }
@@ -3667,7 +4635,7 @@ CHOOSE_FROM_SUBDIR
     <message>Select the sequence to print resources from:</message>
     <resource variable="SEQUENCE">
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
-      <filterfunc>return \$res->is_sequence;</filterfunc>
+      <filterfunc>return &Apache::lonprintout::printable_sequence(\$res);</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
       <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
 	</choicefunc>
@@ -3689,6 +4657,36 @@ CHOOSE_FROM_ANY_SEQUENCE
 
     # Generate the first state, to select which resources get printed.
     Apache::lonhelper::state->new("START", "Select Printing Options:");
+    if (!$res_printable) {
+        my $now = time;
+        my $shownprintstart = &Apache::lonlocal::locallocaltime($res_printstartdate);
+        my $shownprintend = &Apache::lonlocal::locallocaltime($res_printenddate);
+        my $noprintmsg;
+        if (($res_printenddate) && ($res_printenddate < $now)) {
+                $noprintmsg = &mt('Printing for current resource no longer available (ended: [_1])',
+                                  $shownprintend);
+        } else {
+            if (($res_printstartdate) && ($res_printstartdate > $now)) {
+                if (($res_printenddate) && ($res_printenddate > $now) && ($res_printenddate > $res_printstartdate)) {
+                    $noprintmsg = &mt('Printing for current resource is only possible between [_1] and [_2]',
+                                  $shownprintstart,$shownprintend);
+                } elsif (!$res_printenddate) {
+                    $noprintmsg = &mt('Printing for current resource will only be possible starting [_1]',
+                                      $shownprintstart);
+                } else {
+                    $noprintmsg = &mt('Printing for current resource is unavailable');
+                }
+            }
+        }
+
+        if ($noprintmsg) {
+            $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{MESSAGE_TEXT} = 
+                '<p class="LC_info">'.$noprintmsg.'</p>';
+	    Apache::lonhelper::message->new();
+        }
+    }
+    $paramHash = Apache::lonhelper::getParamHash();
     $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{MESSAGE_TEXT} = "";
     Apache::lonhelper::message->new();
@@ -3700,7 +4698,7 @@ CHOOSE_FROM_ANY_SEQUENCE
     my $startedTable = 0; # have we started an HTML table yet? (need
                           # to close it later)
 
-    if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
+    if (($perm{'pav'} and $perm{'vgr'}) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
 	&addMessage('<br />'
                    .'<h3>'.&mt('Print Options').'</h3>'
@@ -3910,8 +4908,9 @@ 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>
 PROBTYPE
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
@@ -3946,10 +4945,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;
@@ -4025,9 +5026,9 @@ 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');
+    my $pdfFormLabel=&mt('PDF Form Fields');
+    my $with=&mt('with Form Fields');
+    my $without=&mt('without Form Fields');
     
 
     $result.='<h3>'.&mt('Layout Options').'</h3>'
@@ -4328,7 +5329,5 @@ sub postprocess {
     }
 }
 
-
-
 __END__