loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.545.2.5 and 1.627.2.24

-version 1.545.2.5, 2009/09/10 23:36:03
+version 1.627.2.24, 2018/09/04 14:35:21
  Line 26
  #
  #
  package Apache::lonprintout;
  use strict;
  use Apache::Constants qw(:common :http);
  use Apache::lonxml;
- Line 37  use Apache::grades;
+ Line 36  use Apache::grades;
  use Apache::edit;
  use Apache::File();
  use Apache::lonnavmaps;
+ use Apache::admannotations;
  use Apache::lonenc;
  use Apache::entities;
+ use Apache::londefdef;
+ # use Apache::structurelags;	# for language management.
- use HTTP::Response;
+ 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;
- Line 66  my $ssi_last_error;  # The error text fr
+ Line 69  my $ssi_last_error;  # The error text fr
  my $ssi_retry_count = 5;	# Some arbitrary value.
+ #  Font size:
+ my $font_size = 'normalsize';	# Default is normalsize...
+ #----------------------------  Helper helpers. -------------------------
+ ##
+ # 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" modallink="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" modallink="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" modallink="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.
+ #   sort_choice  - variable to hold the sorting choice.
+ #   variable     - Name of variable to hold students.
+ #   next_state   - State after chooser.
+ sub generate_student_chooser {
+     my ($this_state,
+ 	$sort_choice,
+ 	$variable,
+ 	$next_state) = @_;
+     my $result = <<CHOOSE_STUDENTS;
+   <state name="$this_state" title="Select Students and Resources">
+       <message><b>Select sorting order of printout</b> </message>
+     <choices variable="$sort_choice">
+       <choice computer='0'>Sort by section then student</choice>
+       <choice computer='1'>Sort by students across sections.</choice>
+     </choices>
+       <message><br /><hr /><br /> </message>
+       <student multichoice='1'
+                variable="$variable"
+                nextstate="$next_state"
+                coursepersonnel="1" />
+   </state>
+ CHOOSE_STUDENTS
+   return $result;
+ }
+ # Generate the text needed for a resource chooser given the top level of
+ # the sequence/page
+ #
+ # Parameters:
+ #     this_state    - State name of the chooser.
+ #     prompt_text   - Text to use to prompt user.
+ #     resource_options - Resource tag options e.g.
+ #                        "multichoice='1', toponly='1', addstatus='1',
+ #                         modallink='1'"
+ #                     that control the selection and appearance of the
+ #                     resource selector.
+ #     variable      - Name of the variable to hold the choice
+ #     next_state    - Name of the next state the helper should transition
+ #                     to
+ #     top_url       - Top level URL within which to make the selector.
+ #                     If empty the top level sequence is shown.
+ #     filter        - How to filter the resources.
+ #     value_func    - <valuefunc> function.
+ #     choice_func   - If not empty generates a <choicefunc> with this function.
+ #     start_new_option
+ #                   - Fragment appended after valuefunc.
+ #
+ #
+ sub generate_resource_chooser {
+     my ($this_state,
+ 	$prompt_text,
+ 	$resource_options,
+ 	$variable,
+ 	$next_state,
+ 	$top_url,
+ 	$filter,
+ 	$choice_func,
+ 	$value_func,
+ 	$start_new_option)  = @_;
+     my $result = <<CHOOSE_RESOURCES;
+ <state name="$this_state" title="$prompt_text">
+     <resource variable="$variable" $resource_options
+               closeallpages="1">
+       <nextstate>$next_state</nextstate>
+       <filterfunc>return $filter;</filterfunc>
+ CHOOSE_RESOURCES
+     if ($choice_func ne '') {
+ 	$result .= "<choicefunc>return $choice_func;</choicefunc>";
+     }
+     if ($top_url ne '') {
+ 	$result .=  "<mapurl>$top_url</mapurl>";
+     }
+     $result .= <<CHOOSE_RESOURCES;
+       <valuefunc>return $value_func;</valuefunc>
+       $start_new_option
+       </resource>
+     </state>
+ CHOOSE_RESOURCES
+     return $result;
+ }
+ #
+ #   Generate the helper XML for a code choice helper dialog:
+ #
+ # Paramters:
+ #   $helper       - Reference to the helper.
+ #   $state        - Name of the state for the chooser.
+ #   $next_state   - Name fo the state to follow the chooser.
+ #   $bubble_types - Populates the bubble sheet type dropt down.
+ #   $code_selections - Provides set of code choices that have been used
+ #   $saved_codes  - Provides the list of saved codes.
+ #
+ # Returns;
+ #   The Xml of the code chooser.
+ #
+ sub generate_code_selector {
+     my ($helper,
+ 	$state,
+ 	$next_state,
+ 	$bubble_types,
+ 	$code_selections,
+ 	$saved_codes) = @_;	# Unpack the parameters.
+     my $result = <<CHOOSE_ANON1;
+   <state name="$state" title="Specify CODEd Assignments">
+     <nextstate>$next_state</nextstate>
+     <message><h4>Fill out one of the forms below</h4></message>
+     <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"  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'} ) {
+ 	    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>
+     <message></td></tr><tr><td></message>
+     <message><b>Names to save the CODEs under for later:</b></message>
+     <message></td><td></message>
+     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+     <message></td></tr><tr><td></message>
+     <message><b>Bubblesheet type:</b></message>
+     <message></td><td></message>
+     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+     $bubble_types
+     </dropdown>
+     <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
+     <message></td></tr><tr><td></table></message>
+     <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+     <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+     <string variable="SINGLE_CODE" size="10">
+         <validator>
+ 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+ 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
+ 	      !\$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.
+ 	   }
+         </validator>
+     </string>
+     <message></td></tr><tr><td></message>
+         $code_selections
+     <message></td></tr></table></message>
+     <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+     <message><b>Select saved CODEs:</b></message>
+     <message></td><td></message>
+     <dropdown variable="REUSE_OLD_CODES">
+         $saved_codes
+     </dropdown>
+     <message></td></tr></table></message>
+   </state>
+ 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 resources 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 selected 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
+ #   $nohidemap - If true, parameter in map for hiddenresource will be
+ #                ignored.  The user calling the routine should have
+ #                both the pav and vgr privileges if this is set to true).
+ #
+ # 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 ($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
- Line 98  sub annotate {
+ Line 818  sub annotate {
      my $annotation_text = &Apache::loncommon::get_annotation($symb, 1);
      my $result = "";
      if (length($annotation_text) > 0) {
- Line 109  sub annotate {
+ Line 830  sub annotate {
      return $result;
  }
+ #
+ #   Set a global document font size:
+ #   This is done by replacing \begin{document}
+ #   with \begin{document}{\some-font-directive
+ #   and \end{document} with
+ #   }\end{document
+ #
+ sub set_font_size {
+     my ($text) = @_;
+     # There appear to be cases where the font directive is empty.. in which
+     # case the first substituion would  insert a spurious \ oh happy day.
+     # as this has been the cause of much mystery and hair pulling _sigh_
+     if ($font_size ne '') {
+ 	$text =~ s/\\begin\{document}/\\begin{document}{\\$font_size/;
+     }
+     $text =~ s/\\end\{document}/}\\end{document}/;
+     return $text;
+ }
+ # include_pdf - PDF files are included into the
+ # output as follows:
+ #  - The PDF, if necessary, is replicated.
+ #  - The PDF is added to the list of files to convert to postscript (along with the images).
+ #  - The LaTeX is added to include the final converted postscript in the file as an included
+ #    job.  The assumption is that the includedpsheader.ps header will be included.
+ #
+ # Parameters:
+ #   pdf_uri   - URI of the PDF file to include.
+ #
+ # Returns:
+ #  The LaTeX to include.
+ #
+ # Assumptions:
+ #    The uri is actually a PDF file
+ #    The postscript will have the includepsheader.ps included.
+ #
  #
- #   ssi_with_retries - Does the server side include of a resource.
+ sub include_pdf {
+     my ($pdf_uri) = @_;
+     # Where is the file? If not local we'll need to repcopy it:'
+     my $file = &Apache::lonnet::filelocation('', $pdf_uri);
+     if (! -e $file) {
+ 	&Apache::lonnet::repcopy($file);
+ 	$file = &Apache::lonnet::filelocation('',$pdf_uri);
+     }
+     #  The file isn ow replicated locally.. or it did not exist in the first place
+     # (unlikely).  If it did exist, add the pdf to the set of files/images that
+     # need tob e converted for this print job:
+     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+     $file =~ s{(.*)/res/}{$londocroot/res/};
+     open(FILE,">>","$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+     print FILE ("$file\n");
+     close (FILE);
+     # Construct the special to put out.  To do this we need to get the
+     # resulting filename after conversion.  The file will have the same name
+     # but will be in the user's spool directory with converted images.
+     my $dirname = "/home/httpd/prtspool/$env{'user.name'}/";
+     my ( $base, $path,  $ext) = &fileparse($file, '.pdf');
+ #    my $destname = $dirname.'/'.$base.'.eps'; # Not really an eps but easier in printout.pl
+     $base =~ s/ /\_/g;
+     my $output = &print_latex_header();
+     $output    .= '\special{ps: _begin_job_ ('
+ 	.$base.'.pdf.eps'.
+ 	')run _end_job_}';
+     return $output;
+ }
+ ##
+ #  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.
  #                      if the ssi call returns an error we'll retry it up to
  #                      the number of times requested by the caller.
  #                      If we still have a proble, no text is appended to the
- Line 144  sub annotate {
+ Line 972  sub annotate {
  sub ssi_with_retries {
      my ($resource, $retries, %form) = @_;
+     my $target = $form{'grade_target'};
+     my $aom    = $form{'answer_output_mode'};
      my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
      if (!$response->is_success) {
- Line 151  sub ssi_with_retries {
+ Line 983  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;
- Line 167  sub get_student_view_with_retries {
+ Line 998  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;
- Line 227  sub printf_style_subst {
+ Line 1057  sub printf_style_subst {
  #     %a    - Assignment name.
  #     %c    - Course name.
  #     %n    - Student name.
+ #     %s    - The section if it is supplied.
  #
  sub format_page_header {
      my ($width, $format, $assignment, $course, $student) = @_;
      $width = &recalcto_mm($width); # Get width in mm.
+     my $chars_per_line = int($width/2);   # Character/textline.
      #  Default format?
      if ($format eq '') {
- Line 245  sub format_page_header {
+ Line 1080  sub format_page_header {
  	#   but only truncate the course.
  	# - Allow the assignment to be 2 lines (wrapped).
  	#
- 	my $chars_per_line = $width/2; # Character/textline.
          my $firstline = "$student $course";
          if (length($firstline) > $chars_per_line) {
              my $lastchar = $chars_per_line - length($student) - 1;
- Line 271  sub format_page_header {
+ Line 1105  sub format_page_header {
          $format =  &printf_style_subst("c", $format, $course);
          $format =  &printf_style_subst("n", $format, $student);
-         # If the user put %'s in the format string, they  must be escaped
+         # If the user put %'s in the format string, they must be escaped
          # to \% else LaTeX will think they are comments and terminate
          # the line.. which is bad!!!
      }
+     return $format;
      # If the user has role author, $course and $assignment are empty so
      # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
      if($format =~ /\\\\\s\\\\\s/) {
          #TODO find sensible caption for page header
-         my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
+         my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
          $format =~ s/\\\\\s\\\\\s/$testPrintout/;
      }
+     #
+     #  We're going to trust LaTeX to break lines appropriately, but
+     #  we'll truncate anything that's more than 3 lines worth of
+     # text.  This is also assuming (which will probably end badly)
+     # nobody's going to embed LaTeX control sequences in the title
+     # header or rather that those control sequences won't get broken
+     # by the stuff below.
+     #
+     my $total_length = 3*$chars_per_line;
+     if (length($format) > $total_length) {
+ 	$format = substr($format, 0, $total_length);
+     }
      return $format;
- Line 390  sub is_code_valid {
+ Line 1240  sub is_code_valid {
      my ($code_type, $code_length) = ('letter', 6);	# defaults.
      my @lines = &Apache::grades::get_scantronformat_file();
      foreach my $line (@lines) {
+         next if (($line =~ /^\#/) || ($line eq ''));
  	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
  	if($name eq $code_option) {
  	    $code_length = $length;
- Line 406  sub is_code_valid {
+ Line 1257  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:
- Line 467  sub compare_names {
+ Line 1334  sub compare_names {
  sub latex_header_footer_remove {
      my $text = shift;
-     $text =~ s/\\end{document}//;
+     $text =~ s/\\end\{document}//;
-     $text =~ s/\\documentclass([^&]*)\\begin{document}//;
+     $text =~ s/\\documentclass([^&]*)\\begin\{document}//;
      return $text;
  }
  #
- Line 856  sub old_character_chart {
+ Line 1723  sub old_character_chart {
      $result =~ s/&(rdquo|#8221);/\'\'/g;
      return $result;
  }
- Line 991  sub page_format_transformation {
+ Line 1859  sub page_format_transformation {
      if ($selectionmade eq '4') {
  	if ($choice eq 'all_problems') {
- 	    $assignment='Problems from the Whole Course';
+             $assignment=&mt('Problems from the Whole Course');
  	} else {
- 	    $assignment='Resources from the Whole Course';
+             $assignment=&mt('Resources from the Whole Course');
  	}
      } else {
  	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
- Line 1016  sub page_format_transformation {
+ Line 1884  sub page_format_transformation {
  	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
      }
      if ($layout eq 'album') {
- 	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
+ 	    $text =~ s/\\begin\{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
      } elsif ($layout eq 'book') {
  	if ($choice ne 'All class print') {
- 	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
+ 	    $text =~ s/\\begin\{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
  	} else {
- 	    $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{}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
+ 	    $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 /;}
      if ($indexlist eq 'yes') {
- 	$text=~s/(\\begin{document})/\\makeindex $1/;
+ 	$text=~s/(\\begin\{document})/\\makeindex $1/;
- 	$text=~s/(\\end{document})/\\strut\\\\\\strut\\printindex $1/;
+ 	$text=~s/(\\end\{document})/\\strut\\\\\\strut\\printindex $1/;
      }
      return $text;
  }
- Line 1039  sub page_format_transformation {
+ Line 1913  sub page_format_transformation {
  sub page_cleanup {
      my $result = shift;
-     $result =~ m/\\end{document}(\d*)$/;
+     $result =~ m/\\end\{document}(\d*)$/;
      my $number_of_columns = $1;
      my $insert = '{';
      for (my $id=1;$id<=$number_of_columns;$id++) { $insert .='l'; }
      $insert .= '}';
-     $result =~ s/(\\begin{longtable})INSERTTHEHEADOFLONGTABLE\\endfirsthead\\endhead/$1$insert/g;
+     $result =~ s/(\\begin\{longtable})INSERTTHEHEADOFLONGTABLE\\endfirsthead\\endhead/$1$insert/g;
      $result =~ s/&\s*REMOVETHEHEADOFLONGTABLE\\\\/\\\\/g;
      return $result,$number_of_columns;
  }
- Line 1080  my $end_of_student = "\n".'\special{ps:E
+ Line 1954  my $end_of_student = "\n".'\special{ps:E
  sub latex_corrections {
      my ($number_of_columns,$result,$selectionmade,$answer_mode) = @_;
- #    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+ #    $result =~ s/\\includegraphics\{/\\includegraphics\[width=\\minipagewidth\]{/g;
      my $copyright = &copyright_line();
      if ($selectionmade eq '1' || $answer_mode eq 'only') {
- 	$result =~ s/(\\end{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
+ 	$result =~ s/(\\end\{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
      } else {
- 	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
+ 	$result =~ s/(\\end\{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
      }
      $result =~ s/\$number_of_columns/$number_of_columns/g;
-     $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
+     $result =~ s/(\\end\{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]\{\\hrulefill})/$2$1/g;
-     $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
+     $result =~ s/(\\end\{longtable}\s*)\\strut\\newline/$1/g;
  #-- LaTeX corrections
      my $first_comment = index($result,'<!--',0);
      while ($first_comment != -1) {
- Line 1108  sub latex_corrections {
+ Line 1982  sub latex_corrections {
      if ($result =~ m/&(\w+|#\d+);/) {
  	$result = &character_chart($result);
      }
-     $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
+     $result =~ s/(\\end\{tabular})\s*\\vskip 0 mm/$1/g;
-     $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
+     $result =~ s/(\\begin\{enumerate})\s*\\noindent/$1/g;
      return $result;
  }
- Line 1144  sub IndexCreation {
+ Line 2018  sub IndexCreation {
  sub print_latex_header {
      my $mode=shift;
-     my $output='\documentclass[letterpaper,twoside]{article}\raggedbottom';
-     if (($mode eq 'batchmode') || (!$perm{'pav'})) {
+     return &Apache::londefdef::latex_header($mode);
- 	$output.='\batchmode';
-     }
-     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
-    	    '\usepackage{multirow}'."\n".
- 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
- 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
- 	     '\usepackage{wrapfig}'.
- 	     '\usepackage{picins}\usepackage{calc}'."\n".
- 	     '\usepackage[T1]{fontenc}'."\n".
-              '\usepackage{lmodern}'."\n".
- 	     '\usepackage[postscript]{ucs}'."\n".
- 	     '\usepackage[utf8x]{inputenc}'."\n".
- 	     '\usepackage{pifont}'  . "\n".
- 	     '\usepackage{latexsym}'."\n".
- 	     '\usepackage{amsmath}'.
- 	     '\usepackage{amssymb}'.
- 	     '\usepackage{amsfonts}'.
- 	     '\usepackage{amsthm}'.
- 	     '\usepackage{amscd}'.
- 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
- 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
- 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
- 	     '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'."\n".
- 	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
- 	     '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'."\n".
- 	     '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'."\n".
- 	     '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'."\n".
- 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'."\n".
- 	     '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'."\n".
- 	     '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'."\n".
- 	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
- 	     '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}'."\n";
-     return $output;
  }
  sub path_to_problem {
- Line 1239  sub unsupported {
+ Line 2080  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.' ';
- Line 1249  sub unsupported {
+ Line 2091  sub unsupported {
      return $result;
  }
+ #
+ #  Map from helper layout style to the book/album:
+ #
+ sub map_laystyle {
+     my ($laystyle) = @_;
+     if ($laystyle eq 'L') {
+ 	$laystyle='album';
+     } else {
+ 	$laystyle='book';
+     }
+     return $laystyle;
+ }
+ sub print_page_in_course {
+     my ($helper, $rparmhash, $currentURL, $resources) = @_;
+     my %parmhash       = %$rparmhash;
+     my @page_resources = @$resources;
+     my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
+     my $symb = $helper->{'VARS'}->{'symb'};
+     my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
+     my @temporary_array=split /\|/,$format_from_helper;
+     my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
+     $laystyle = &map_laystyle($laystyle);
+     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,
+ 								      $numberofcolumns);
+     my $LaTeXwidth=&recalcto_mm($textwidth);
+     if ($mode ne '') {$mode='\\'.$mode}
+     my $result   =    &print_latex_header($mode);
+     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
+ 	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
+ 	my $title=&Apache::lonnet::gettitle($symb);
+ 	$title = &Apache::lonxml::latex_special_symbols($title);
+     } else {
+         my $esc_currentURL= $currentURL;
+         $esc_currentURL =~ s/_/\\_/g;
+ 	$result.=$esc_currentURL;
+     }
+     $result .= '\\\\';
+     if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+ 	&Apache::lonnet::appenv({'construct.style' =>
+ 				$helper->{'VARS'}->{'style_file'}});
+     } elsif ($env{'construct.style'}) {
+ 	&Apache::lonnet::delenv('construct.style');
+     }
+     # First is the overall page description.  This is then followed by the
+     # components of the page. Each of which must be printed independently.
+     my $the_page = shift(@page_resources);
+     foreach my $resource (@page_resources) {
+ 	my $resource_src   = $resource->src(); # Essentially the URL of the resource.
+ 	$result           .= $resource->title() . '\\\\';
+ 	# Recurse if a .page:
+ 	if ($resource_src =~ /.page$/i) {
+ 	    my $navmap         = Apache::lonnavmaps::navmap->new();
+ 	    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|xml|html|htm|xhtml|xhtm)$/)  {
+ 	    my $urlp = &Apache::lonnet::clutter($resource_src);
+ 	    my %form;
+ 	    my %moreenv;
+ 	    &Apache::lonxml::remember_problem_counter();
+ 	    $moreenv{'request.filename'}=$urlp;
+ 	    if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
+ 	    $form{'grade_target'}  = 'tex';
+ 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+ 	    $form{'pdfFormFields'} = 'no'; #
+ 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
+ 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 	    $form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ 	    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 	    $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 	    $form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ 	    if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+ 		($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+ 		$form{'problem_split'}='yes';
+ 	    }
+ 	    my $rndseed = time;
+ 	    if ($helper->{'VARS'}->{'curseed'}) {
+ 		$rndseed=$helper->{'VARS'}->{'curseed'};
+ 	    }
+ 	    $form{'rndseed'}=$rndseed;
+ 	    &Apache::lonnet::appenv(\%moreenv);
+ 	    &Apache::lonxml::clear_problem_counter();
+ 	    my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
+ 	    # current document with answers.. no need to encap in minipage
+ 	    #  since there's only one answer.
+ 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ 		my %answerform = %form;
+ 		$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 		$answerform{'grade_target'}='answer';
+ 		$answerform{'answer_output_mode'}='tex';
+ 		$answerform{'rndseed'}=$rndseed;
+                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {
+ 		    $answerform{'problemtype'}='exam';
+ 		}
+ 		$resources_printed .= $urlp.':';
+ 		my $answer=&ssi_with_retries($urlp,$ssi_retry_count, %answerform);
+ 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 		    $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
+ 		} else {
+ 		    $texversion= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 		    if ($helper->{'VARS'}->{'construction'} ne '1') {
+ 			my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+ 			$title = &Apache::lonxml::latex_special_symbols($title);
+ 			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ 			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
+ 		    } else {
+ 			$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}';
+ 		}
+ 	    }
+ 	    # Print annotations.
+ 	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ 		my $annotation .= &annotate($currentURL);
+ 		$texversion =~ s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
+ 	    }
+ 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ 		$texversion=&IndexCreation($texversion,$currentURL);
+ 	    }
+ 	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ 		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+ 	    }
+ 	    $texversion = &latex_header_footer_remove($texversion);
+ 	    # the first remaining line is a comment from londefdef the second
+ 	    # line  seems to be an extraneous \vskip 1mm \\\\ :
+             # (imperfect removal from header_footer_remove?
+ 	    $texversion =~ s/\\vskip 1mm \\\\\\\\//;
+ 	    $result .= $texversion;
+ 	    if ($currentURL=~m/\.page\s*$/) {
+ 		($result,$numberofcolumns) = &page_cleanup($result);
+ 	    }
+ 	}
+     }
+     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
+     return $result;
+ }
  #
  # List of recently generated print files
  #
  sub recently_generated {
-     my $r=shift;
+     my ($prtspool) = @_;
-     my $prtspool=$r->dir_config('lonPrtDir');
+     my $output;
      my $zip_result;
      my $pdf_result;
      opendir(DIR,$prtspool);
- Line 1288  sub recently_generated {
+ Line 2315  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>'
- Line 1299  sub recently_generated {
+ Line 2326  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>'
- Line 1311  sub recently_generated {
+ Line 2337  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;
  }
  #
- Line 1325  sub recently_generated {
+ Line 2351  sub recently_generated {
  #    A reference to a page break hash.
  #
  #
- #use Data::Dumper;
+ # 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");
- Line 1341  sub get_page_breaks  {
+ Line 2367  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.
- Line 1357  sub get_page_breaks  {
+ Line 2499  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;
- Line 1383  sub print_construction_sequence {
+ Line 2528  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';
- Line 1394  sub print_construction_sequence {
+ Line 2539  sub print_construction_sequence {
  		$resources_printed .= $urlp.':';
  		my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
  		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 		    $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
  		} else {
  		    # If necessary, encapsulate answer in minipage:
- Line 1419  sub print_construction_sequence {
+ Line 2564  sub print_construction_sequence {
  	    $result.=$texversion;
  	} elsif ($urlp=~/\.(sequence|page)$/) {
  	    # header:
  	    $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
- Line 1427  sub print_construction_sequence {
+ Line 2572  sub print_construction_sequence {
  	    # IF sequence, recurse:
  	    if ($urlp =~ /\.sequence$/) {
- 		my $sequence_url = $urlp;
+ 		$result .= &print_construction_sequence($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,
  							$helper, %form,
  							$LaTeXwidth);
  	    }
  	}
+ 	elsif ($urlp =~ /\.pdf$/i) {
+ 	    my $texversion;
+ 	    if ($member != 0) {
+ 		$texversion .= '\cleardoublepage';
+ 	    }
+ 	    $texversion .= &include_pdf($urlp);
+ 	    $texversion = &latex_header_footer_remove($texversion);
+ 	    if ($member != $#order) {
+ 		$texversion .= '\\ \cleardoublepage';
+ 	    }
+ 	    $result .= $texversion;
+ 	}
      }
-     if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+     if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin\{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
      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">
- Line 1478  sub output_data {
+ Line 2664  sub output_data {
  ENDPART
+     # Breadcrumbs
-     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);
+     #FIXME: Choose better/different breadcrumbs?!? Links?
+     my $brcrum = [{'href' => '',
+                    'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
+                   {'href' => '',
+                    'text' => 'Preparing Printout'}];
+     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',
+                                                      $js,
+                                                      {'bread_crumbs' => $brcrum,});
      my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
      $r->print($start_page."\n<p>\n$msg\n</p>\n");
- Line 1489  ENDPART
+ Line 2683  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'};
      my ($result,$selectionmade) = ('','');
      my $number_of_columns = 1; #used only for pages to determine the width of the cell
      my @temporary_array=split /\|/,$format_from_helper;
-     my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
+     my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
-     if ($laystyle eq 'L') {
- 	$laystyle='album';
+     $laystyle = &map_laystyle($laystyle);
-     } else {
- 	$laystyle='book';
-     }
      my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
      my $assignment =  $env{'form.assignment'};
      my $LaTeXwidth=&recalcto_mm($textwidth);
- Line 1521  ENDPART
+ Line 2714  ENDPART
      my %form;
      $form{'grade_target'} = 'tex';
      $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+     $form{'pdfFormFields'} = 'no';
      # If form.showallfoils is set, then request all foils be shown:
      # privilege will be enforced both by not allowing the
- Line 1540  ENDPART
+ Line 2734  ENDPART
  	&Apache::lonnet::delenv('construct.style');
      }
+     if ($print_type eq 'current_document') {
-     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
        #-- single document - problem, page, html, xml, ...
  	my ($currentURL,$cleanURL);
- Line 1552  ENDPART
+ Line 2745  ENDPART
  	} else {
              #prints resource from the construction space
- 	    $currentURL='/'.$helper->{'VARS'}->{'filename'};
+ 	    $currentURL=$helper->{'VARS'}->{'filename'};
- 	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
  	    $cleanURL=$currentURL;
  	}
  	$selectionmade = 1;
  	if ($cleanURL!~m|^/adm/|
- 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
  	    my $rndseed=time;
  	    my $texversion='';
  	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
- Line 1596  ENDPART
+ Line 2789  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';
- Line 1608  ENDPART
+ Line 2802  ENDPART
  		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 		    $texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
  		} else {
  		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
  		    if ($helper->{'VARS'}->{'construction'} ne '1') {
- Line 1617  ENDPART
+ Line 2811  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 ';
+ 			$texversion.='\vskip 0 mm \noindent\textbf{'.
- 			my $URLpath=$cleanURL;
+                         &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
- 			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
- 			$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
+ 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
  		    }
  		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
  		}
- Line 1628  ENDPART
+ Line 2822  ENDPART
  	    }
  	    # Print annotations.
  	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
  		my $annotation .= &annotate($currentURL);
- 		$texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 		$texversion =~ s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
  	    }
- Line 1650  ENDPART
+ Line 2845  ENDPART
  		($result,$number_of_columns) = &page_cleanup($result);
  	    }
          } elsif ($cleanURL!~m|^/adm/|
- 		 && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
+ 		 && $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}';
- Line 1665  ENDPART
+ Line 2857  ENDPART
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
  		$resources_printed .= $currentURL.':';
- 		my $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/;
+ 		    $texversion    =~ s/(\\end\{document})/$annotation$1/;
  		}
  		$result .= $texversion;
- 	} elsif ($cleanURL =~/.tex$/) {
+ 	} elsif ($cleanURL =~/\.tex$/) {
  	    # For this sort of print of a single LaTeX file,
  	    # We can just print the LaTeX file as it is uninterpreted in any way:
  	    #
- Line 1679  ENDPART
+ Line 2871  ENDPART
  	    $result = &fetch_raw_resource($currentURL);
  	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
  		my $annotation = &annotate($currentURL);
- 		$result =~ s/(\\end{document})/$annotation$1/;
+ 		$result =~ s/(\\end\{document})/$annotation$1/;
  	    }
  	    $do_postprocessing = 0; # Don't massage the result.
+ 	} elsif ($cleanURL =~ /\.pdf$/i) {
+ 	    $result .= &include_pdf($cleanURL);
+ 	    $result .= '\end{document}';
+ 	} elsif ($cleanURL =~ /\.page$/i) { #  Print page in non construction space contexts.
+ 	    # Determine the set of resources in the map of the page:
+ 	    my $navmap         =  Apache::lonnavmaps::navmap->new();
+ 	    my @page_resources =  $navmap->retrieveResources($cleanURL);
+ 	    $result           .=  &print_page_in_course($helper, $rparmhash,
+ 							$cleanURL, \@page_resources);
  	} else {
  	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
  				  $helper->{'VARS'}->{'symb'});
  	}
-     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or
+     } elsif (($print_type eq 'map_problems')          or
-              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
+ 	     ($print_type eq 'map_problems_in_page')  or
-              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
+ 	     ($print_type eq 'map_resources_in_page') or
- 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
+              ($print_type eq 'map_problems_pages')    or
- 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')
+              ($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') {
+ 	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') {
+ 	} 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'};
- Line 1725  ENDPART
+ Line 2937  ENDPART
  	&Apache::lonxml::clear_problem_counter();
- 	my $pbreakresources = keys %page_breaks;
  	for (my $i=0;$i<=$#master_seq;$i++) {
  	    &Apache::lonenc::reset_enc();
- Line 1739  ENDPART
+ Line 2950  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];
  	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
  	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
- Line 1751  ENDPART
+ Line 2962  ENDPART
  	    my $texversion='';
  	    if ($urlp!~m|^/adm/|
  		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+                 my $extension = $1;
  		$resources_printed .= $urlp.':';
  		&Apache::lonxml::remember_problem_counter();
+ 		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') && ($extension !~ /^x?html?$/))))) {
+                         $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}/;
+ 		    $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')) {
- Line 1771  ENDPART
+ Line 2993  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}//; # 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 ';
- Line 1792  ENDPART
+ Line 3024  ENDPART
  		}
  		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
  		    my $annotation .= &annotate($urlp);
- 		    $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 		    $texversion =~ s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
  		}
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
- 		    $texversion =~ s/\\end{document}//;
+ 		    $texversion =~ s/\\end\{document}//;
  		}
  		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  		    $texversion=&IndexCreation($texversion,$urlp);
- Line 1806  ENDPART
+ Line 3038  ENDPART
  		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
  		    my $name = &get_name();
  		    my $courseidinfo = &get_course();
- 		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+                     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
  		    $prevassignment=$assignment;
  		    my $header_text = $parmhash{'print_header_format'};
  		    $header_text    = &format_page_header($textwidth, $header_text,
- Line 1825  ENDPART
+ Line 3057  ENDPART
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
  		$resources_printed .= $urlp.':';
- 		my $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/;
+ 		    $texversion =~ s/(\\end\{document)/$annotation$1/;
  		}
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
- 		    $texversion =~ s/\\end{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
+ 		    $texversion =~ s/\\end\{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
  		}
  		$result .= $texversion;
  		$flag_latex_header_remove = 'YES';
+ 	    } elsif ($urlp=~ /\.pdf$/i) {
+ 		if ($i > 0) {
+ 		    $result .= '\cleardoublepage';
+ 		}
+                 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';
+ 		    } else {
+ 			# the \\'s seem to be needed to let LaTeX know there's something
+ 			# on the page since LaTeX seems to not like to clear an empty page.
+ 			#
+ 			$result .= '\\ \cleardoublepage';
+ 		    }
+ 		}
+ 		$flag_latex_header_remove = 'YES';
  	    } else {
  		$texversion=&unsupported($urlp,$helper->{'VARS'}->{'LATEX_TYPE'},
  					 $master_seq[$i]);
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
- 		    $texversion =~ s/\\end{document}//;
+ 		    $texversion =~ s/\\end\{document}//;
  		}
  		$result .= $texversion;
  		$flag_latex_header_remove = 'YES';
  	    }
- 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
+ 	    if (&Apache::loncommon::connection_aborted($r)) {
+ 		last;
+ 	    }
  	}
  	&Apache::lonxml::clear_problem_counter();
  	if ($flag_page_in_sequence eq 'YES') {
- 	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+ 	    $result =~ s/\\usepackage\{calc}/\\usepackage{calc}\\usepackage{longtable}/;
  	}
  	$result .= '\end{document}';
-      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+      } elsif (($print_type eq 'problems_for_students')           ||
- 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ||
+ 	      ($print_type eq 'problems_for_students_from_page') ||
- 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
+ 	      ($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') ||
+ 	 if (($print_type eq 'problems_for_students')           ||
- 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_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';
  	 }
- Line 1884  ENDPART
+ Line 3145  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);
- Line 1902  ENDPART
+ Line 3165  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';
+  	 my $flag_latex_header_remove = 'NO';
  	 my %moreenv;
           $moreenv{'instructor_comments'}='hide';
  	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
- Line 1915  ENDPART
+ Line 3185  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];
+          my $nohidemap;
+          if ($perm{'pav'} && $perm{'vgr'}) {
+              $nohidemap = 1;
+          }
  	 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);
- Line 1936  ENDPART
+ Line 3209  ENDPART
  	     } else {
  		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
  	     }
+ 	     my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+                                                        $person, undef, $nohidemap);
  	     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')     ||
+      } elsif (($print_type eq 'problems_for_anon')      ||
- 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_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'};
- Line 1959  ENDPART
+ Line 3236  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) {
- Line 2002  ENDPART
+ Line 3298  ENDPART
  		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
  					    $code_type);
  	     }
+              $code_name =~ s/^\s+//;
+              $code_name =~ s/\s+$//;
  	     if ($code_name) {
  		 &Apache::lonnet::put('CODEs',
  				      {
- Line 2013  ENDPART
+ Line 3311  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') {
+ 	 if ($number_per_page eq '0' || $number_per_page eq 'all'
- 	     $number_per_page=$num_todo;
+ 	     || $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;
+          my $nohidemap;
+          if ($perm{'pav'} && $perm{'vgr'}) {
+              $nohidemap = 1;
+          }
  	 foreach my $code (sort(@allcodes)) {
  	     my $file_num=int($count/$number_per_page);
  	     if ($code_type eq 'number') {
- Line 2029  ENDPART
+ Line 3332  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'}, $nohidemap);
+                  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;
- Line 2043  ENDPART
+ Line 3354  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'};
- Line 2062  ENDPART
+ Line 3373  ENDPART
  	    if ($urlp=~/\//) {
  		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  		$form{'rndseed'}=$rndseed;
- 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
+ 		$urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
- 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
- 		} else {
- 		    $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') ||
- Line 2080  ENDPART
+ Line 3387  ENDPART
  		    $resources_printed .= $urlp.':';
  		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
  		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 			$texversion=~s/(\\keephidden\{ENDOFPROBLEM})/$answer$1/;
  		    } else {
  			$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
  			if ($helper->{'VARS'}->{'construction'} ne '1') {
  			    $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 ';
+ 			    $texversion.='\vskip 0 mm \noindent\textbf{'.
- 			    my $URLpath=$urlp;
+                                          &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
- 			    $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
+ 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
- 			    $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
  			}
  			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
  		    }
  		}
                  #this chunk is responsible for printing the path to problem
- 		my $newurlp=$urlp;
+ 		my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
- 		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
+ 		$texversion =~ s/(\\begin\{minipage}\{\\textwidth})/$1 $newurlp/;
- 		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
- 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
- 		    $texversion =~ s/\\end{document}//;
+ 		    $texversion =~ s/\\end\{document}//;
  		}
  		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  		    $texversion=&IndexCreation($texversion,$urlp);
- Line 2125  ENDPART
+ Line 3429  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) {
- Line 2136  ENDPART
+ Line 3446  ENDPART
  	#}
      }
-     # Set URLback if this is a construction space print so we can provide
+     # Set URLback so we can provide a link back to the resource and to change options.
-     # a link to the resource being edited.
+     # (Since the browser back button does not currently work with https,
-     #
+     # the back link is useful even when there is an easy-to-miss LON-CAPA back button.)
      my $URLback=''; #link to original document
      if ($helper->{'VARS'}->{'construction'} eq '1') {
- 	#prints resource from the construction space
+ 	$URLback=$helper->{'VARS'}->{'filename'};
- 	$URLback='/'.$helper->{'VARS'}->{'filename'};
+     } elsif ($helper->{VARS}{'symb'}) {
- 	if ($URLback=~/([^?]+)/) {
+         my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
- 	    $URLback=$1;
+         $url = &Apache::lonnet::clutter($url);
- 	    $URLback=~s|^/~|/priv/|;
+         if ($env{'request.enc'}) {
- 	}
+             $url = &Apache::lonenc::encrypted($url);
+         }
+         if ($url ne '') {
+             $URLback = $url.(($url =~ /\?/) ? '&amp;':'?').'symb='.$helper->{VARS}{'symb'};
+         }
      }
+     #
+     # Final adjustment of the font size:
+     #
+     $result = set_font_size($result);
+     # Insert any babel headers required.
+     $result       = &collect_languages($result);
  #-- writing .tex file in prtspool
      my $temp_file;
- Line 2221  ENDPART
+ Line 3545  ENDPART
  				'cgi.'.$identifier.'.role' => $perm{'pav'},
  				'cgi.'.$identifier.'.numberoffiles' => $#print_array,
  				'cgi.'.$identifier.'.studentnames' => $student_names,
- 				'cgi.'.$identifier.'.backref' => $URLback,});
+ 				'cgi.'.$identifier.'.backref' => &escape($URLback),});
      &Apache::lonnet::appenv({"cgi.$identifier.user"    => $env{'user.name'},
  				"cgi.$identifier.domain"  => $env{'user.domain'},
  				"cgi.$identifier.courseid" => $cnum,
- Line 2233  ENDPART
+ Line 3557  ENDPART
      # If there's been an unrecoverable SSI error, report it to the user
      if ($ssi_error) {
          my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
-         $r->print('<br /><h2>'.&mt('An unrecoverable network error occurred:').'</h2><p>  '.
+         $r->print('<br /><p class="LC_error">'.&mt('An unrecoverable network error occurred:').'</p><p>'.
                    &mt('At least one of the resources you chose to print could not be rendered due to an unrecoverable error when communicating with a server:').
                    '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
                    '</p><p>'.&mt('You can continue using the link provided below, but make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
- Line 2277  sub print_resources {
+ Line 3601  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
- Line 2302  sub print_resources {
+ Line 3640  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();
+     my $possprint = scalar(@{$master_seq});
+     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
      foreach my $curresline (@{$master_seq})  {
  	if (defined $page_breaks{$curresline}) {
- Line 2309  sub print_resources {
+ Line 3654  sub print_resources {
  		$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)$/)) ) {
+ 	       ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
- 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+ 	    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)$/) {
  		    $printed .= $curresline.':';
  		    &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();
- Line 2335  sub print_resources {
+ Line 3701  sub print_resources {
  			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%answerenv);
  			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+ 			    $rendered=~s/(\\keephidden\{ENDOFPROBLEM})/$ansrendered$1/;
  			} else {
  			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+                             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 ';
- Line 2349  sub print_resources {
+ Line 3718  sub print_resources {
  			    $rendered = $header.$body;
  			}
  		    }
  		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
  			my $url = &Apache::lonnet::clutter($res_url);
  			my $annotation = &annotate($url);
- 			$rendered =~  s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 			$rendered =~  s/(\\keephidden\{ENDOFPROBLEM})/$annotation$1/;
  		    }
+ 		    my $junk;
  		    if ($remove_latex_header eq 'YES') {
  			$rendered = &latex_header_footer_remove($rendered);
  		    } else {
- 			$rendered =~ s/\\end{document}//;
+ 			$rendered =~ s/\\end\{document}//;
  		    }
  		    $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') {
  			my $url = &Apache::lonnet::clutter($res_url);
  			my $annotation = &annotate($url);
- 			$annotation    =~ s/(\\end{document})/$annotation$1/;
+ 			$annotation    =~ s/(\\end\{document})/$annotation$1/;
  		    }
  		    if ($remove_latex_header eq 'YES') {
  			$rendered = &latex_header_footer_remove($rendered);
  		    } else {
- 			$rendered =~ s/\\end{document}//;
+ 			$rendered =~ s/\\end\{document}//;
  		    }
  		    $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
+ 		} elsif($res_url = ~/\.pdf$/) {
+ 		    my $url = &Apache::lonnet::clutter($res_url);
+ 		    my $rendered  = &include_pdf($url);
+ 		    if ($remove_latex_header ne 'NO') {
+ 			$rendered = &latex_header_footer_remove($rendered);
+ 		    }
+ 		    $current_output .= $rendered;
  		} else {
  		    my $rendered = &unsupported($res_url,$helper->{'VARS'}->{'LATEX_TYPE'},$curresline);
  		    if ($remove_latex_header ne 'NO') {
  			$rendered = &latex_header_footer_remove($rendered);
  		    } else {
- 			$rendered =~ s/\\end{document}//;
+ 			$rendered =~ s/\\end\{document}//;
  		    }
  		    $current_output .= $rendered;
  		}
  	    }
  	    $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);
+ 	    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; }
      }
-     my $courseidinfo = &get_course();
+     # If we are printing incomplete it's possible we don't have
-     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+     # anything to print.  The print subsystem is not so good at handling
-     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
+     # that so we're going to generate a stub that says there are no
+     # incomplete resources for the person.
+     #
+     if ($actually_printed == 0) {
+         my $message = &mt('No resources to print');
+         if (!$possprint) {
+             if ($perm{'pav'} || $perm{'pfo'}) {
+                 $message = &mt('There are no unhidden resources to print.')."\n\n".
+                            &mt('The most likely reason is one of the following: ')."\n".
+                            '\begin{itemize}'."\n".
+                            '\item '.&mt("The 'Resource hidden from students' parameter is set for the folder being printed.")."\n".
+                            '\item '.&mt("'Hidden' is checked in the Course Editor individually for each resource in the folder being printed.")."\n".
+                            '\end{itemize}'."\n\n".
+                            &mt("Note: to print a bubblesheet exam which you want to hide from students, ".
+                                "use the Course Editor to check the 'Hidden' checkbox for the exam folder itself.")."\n";
+             }
+         } elsif ($print_incomplete) {
+             $message = &mt('No incomplete resources');
+         }
+         if ($message) {
+             $current_output  = &encapsulate_minipage("\\vskip -10mm \n$message\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);
+ 	}
+     }
+     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'},
+         &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
- 			    $currentassignment, $courseidinfo, $fullname);
+                             $currentassignment, $courseidinfo, $fullname);
-     my $header_start = ($columns_in_format == 1) ? '\lhead'
+     my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
- 	                                         : '\fancyhead[LO]';
+     my $newheader = $header_start.'{'.$header_line.'}';
-     $header_line = $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.
- Line 2419  sub print_resources {
+ Line 3841  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;
- Line 2450  sub handler {
+ Line 3904  sub handler {
      &output_data($r,$helper,\%parmhash);
      return OK;
  }
  use Apache::lonhelper;
- Line 2475  sub init_perm {
+ Line 3929  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 {
- Line 2490  sub get_randomly_ordered_warning {
+ Line 3949  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 {
-         &Apache::lonnet::logthis('Retrieval of resources to check for folders set to be randomly ordered failed - could not create navmap object');
          $message = "Retrieval of information about ordering of resources failed.";
          return '<message type="warning">'.$message.'</message>';
      }
- Line 2547  sub printHelper {
+ Line 4000  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
- Line 2569  sub printHelper {
+ Line 4024  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:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
+     if ($env{'form.postdata'}=~m{^/priv}) {
-         $helper->{VARS}->{'filename'} = "~$1/$2";
+         $helper->{VARS}->{'filename'} = $env{'form.postdata'};
          $helper->{VARS}->{'construction'} = 1;
      } else {
          if ($env{'form.postdata'}) {
- Line 2617  sub printHelper {
+ Line 4076  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'}) {
- Line 2625  sub printHelper {
+ Line 4092  sub printHelper {
          $subdir = substr($helper->{VARS}->{'filename'},
 , rindex($helper->{VARS}->{'filename'}, '/') + 1);
      } else {
+ 	# From course space:
  	if ($symb ne '') {
  	    ($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.
  	}
  	$url = &Apache::lonnet::clutter($url);
          if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
              my $postdata = $helper->{VARS}->{'postdata'};
              $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'};
      }
- Line 2669  sub printHelper {
+ Line 4149  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 $isProblemOrMap = '($res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
-     my $isNotMap = '!$res->is_sequence()';
+     $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');
- Line 2690  sub printHelper {
+ Line 4180  sub printHelper {
      my $start_new_option;
      if ($perm{'pav'}) {
  	$start_new_option =
- 	    "<option text='".&mt('Start new page<br />before selected').
+ 	    "<option text='".&mt('Start new page[_1]before selected','<br />').
- 	    "' variable='FINISHPAGE' />";
+ 	    "' 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 (($helper->{'VARS'}->{'construction'} ne '1' ) &&
+     # If not construction space user can print the components of a page:
+     my $page_ispage;
+     my $page_title;
+     if (!$helper->{VARS}->{'construction'}) {
+ 	my $varspostdata = $helper->{VARS}->{'postdata'};
+ 	my $varsassignment = $helper->{VARS}->{'assignment'};
+ 	my $page_navmap         = Apache::lonnavmaps::navmap->new();
+ 	if (defined($page_navmap)) {
+ 	    my @page_resources      = $page_navmap->retrieveResources($url);
+ 	    if(defined($page_resources[0])) {
+ 		$page_ispage       = $page_resources[0]->is_page();
+ 		$page_title     = $page_resources[0]->title();
+ 		my $resourcesymb   = $page_resources[0]->symb();
+ 		my ($pagemap, $pageid, $pageurl) = &Apache::lonnet::decode_symb($symb);
+ 		if ($page_ispage) {
+ 		    push @{$printChoices},
+ 		    [&mt('Selected [_1]Problems[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'),
+ 		     'map_problems_in_page',
+ 		     'CHOOSE_PROBLEMS_PAGE'];
+ 		    push @{$printChoices},
+ 		    [&mt('Selected [_1]Resources[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'),
+ 		     'map_resources_in_page',
+ 		     'CHOOSE_RESOURCES_PAGE'];
+ 		}
+         my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS_PAGE',
+ 							'Select Problem(s) to print',
+ 							"multichoice='1' toponly='1' addstatus='1' closeallpages='1' modallink='1'",
+ 							'RESOURCES',
+ 							'PAGESIZE',
+ 							$url,
+ 							$isProblem, '',  $symbFilter,
+ 							$start_new_option);
+       $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
+ 						    'Select Resource(s) to print',
+ 						    'multichoice="1" toponly="1" addstatus="1" closeallpages="1" modallink="1"',
+ 						    'RESOURCES',
+ 						    'PAGESIZE',
+ 						    $url,
+ 						    $isNotMap, '', $symbFilter,
+ 						    $start_new_option);
+ 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+ 	    }
+ 	}
+     }
+     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}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
+ 	if ($userCanPrint || &printable($map_open, $map_close)) {
-         # Allow all resources from sequence
+ 	    push @{$printChoices},
-         push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+ 	    [&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" modallink="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" modallink="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 ($perm{'pfo'} &&  !$is_published  &&
+         ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
-         my $helperFragment = <<HELPERFRAGMENT;
+ 	# BZ 5209 - incomplete problems from entire course:
-   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
-     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
-               closeallpages="1">
-       <nextstate>PAGESIZE</nextstate>
-       <filterfunc>return $isProblem;</filterfunc>
-       <mapurl>$map</mapurl>
-       <valuefunc>return $symbFilter;</valuefunc>
-       $start_new_option
-       </resource>
-     </state>
-   <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
+ 	push(@{$printChoices},
-     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
+ 	     [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
-               closeallpages="1">
+ 	      'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
-       <nextstate>PAGESIZE</nextstate>
+ 	my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
-       <filterfunc>return $isNotMap;</filterfunc>
-       <mapurl>$map</mapurl>
-       <valuefunc>return $symbFilter;</valuefunc>
-       $start_new_option
-       </resource>
-     </state>
- HELPERFRAGMENT
  	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
-     }
-     # If the user has pfo (print for otheres) allow them to print all
+ 	#  Selected problems/resources from entire course:
-     # problems and resources  in the entier course, optionally for selected students
-     if ($perm{'pfo'} &&  !$is_published  &&
-         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
          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'];
-          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
+ my $suffixXml = <<ALL_PROBLEMS;
-   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
-     <resource variable="RESOURCES" toponly='0' multichoice="1"
- 	suppressEmptySequences='0' addstatus="1" closeallpages="1">
-       <nextstate>PAGESIZE</nextstate>
-       <filterfunc>return $isProblemOrMap;</filterfunc>
-       <choicefunc>return $isNotMap;</choicefunc>
-       <valuefunc>return $symbFilter;</valuefunc>
-       $start_new_option
-     </resource>
-   </state>
-   <state name="ALL_RESOURCES" title="Select Resource(s) to print">
-     <resource variable="RESOURCES" toponly='0' multichoice='1'
-               suppressEmptySequences='0' addstatus='1' closeallpages='1'>
-       <nextstate>PAGESIZE</nextstate>
-       <filterfunc>return $isNotMap; </filterfunc>
-       <valuefunc>return $symbFilter;</valuefunc>
-       $start_new_option
-     </resource>
-   </state>
-   <state name="ALL_PROBLEMS_STUDENTS" title="Select Problem(s) to print">
-     <resource variable="RESOURCES" toponly='0' multichoice="1"
- 	suppressEmptySequences='0' addstatus="1" closeallpages="1">
-       <nextstate>STUDENTS1</nextstate>
-       <filterfunc>return $isProblemOrMap;</filterfunc>
-       <choicefunc>return $isNotMap;</choicefunc>
-       <valuefunc>return $symbFilter;</valuefunc>
-       $start_new_option
-     </resource>
-   </state>
    <state name="STUDENTS1" title="Select People">
        <message><b>Select sorting order of printout</b> </message>
      <choices variable='student_sort'>
- Line 2777  HELPERFRAGMENT
+ Line 4348  HELPERFRAGMENT
        <message><br /><hr /><br /> </message>
        <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
    </state>
  ALL_PROBLEMS
+          &Apache::lonxml::xmlparse($r, 'helper',
+ 				   &generate_resource_chooser('ALL_PROBLEMS',
+ 							      'Select Problem(s) to print',
+ 							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1"',
+ 							      'RESOURCES',
+ 							      'PAGESIZE',
+ 							      '',
+ 							      $isProblemOrMap, $isNotMap,
+ 							      $symbFilter,
+ 							      $start_new_option) .
+ 				   &generate_resource_chooser('ALL_RESOURCES',
+ 							      'Select Resource(s) to print',
+ 							      " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1' modallink='1'",
+ 							      'RESOURCES',
+ 							      'PAGESIZE',
+ 							      '',
+ 							      $isNotMap,'',$symbFilter,
+ 							      $start_new_option) .
+ 				   &generate_resource_chooser('ALL_PROBLEMS_STUDENTS',
+ 							      'Select Problem(s) to print',
+ 							      'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1" modallink="1"',
+ 							      'RESOURCES',
+ 							      'STUDENTS1',
+ 							      '',
+ 							      $isProblemOrMap,'' , $symbFilter,
+ 							      $start_new_option) .
+ 				     $suffixXml
+ 				   );
  	if ($helper->{VARS}->{'assignment'}) {
- 	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
- 	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
+ 	    # If we were looking at a page, allow a selection of problems from the page
+ 	    # either for selected students or for coded assignments.
+ 	    if ($page_ispage) {
+ 		push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',
+ 					    '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
+ 					'problems_for_students_from_page', 'CHOOSE_TGT_STUDENTS_PAGE'];
+ 		push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]CODEd assignments[_5]',
+ 					    '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
+ 					'problems_for_anon_page', 'CHOOSE_ANON1_PAGE'];
+ 	    }
+ 	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',
+ 					'<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),
+ 				    'problems_for_students', 'CHOOSE_STUDENTS'];
+ 	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]',
+ 					'<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),
+ 				    'problems_for_anon', 'CHOOSE_ANON1'];
  	}
  	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.
- Line 2797  ALL_PROBLEMS
+ Line 4411  ALL_PROBLEMS
  	#    with one state, and use REGEXPs at inclusion time to set state names
  	#    and next states for better mix and match capability
  	#
- 	my $resource_selector=<<RESOURCE_SELECTOR;
+ 	my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',
-     <state name="SELECT_PROBLEMS" title="Select resources to print">
+ 							  'Select resources to print',
-     $randomly_ordered_warning
+ 							  'multichoice="1" addstatus="1" closeallpages="1" modallink="1"',
+ 							  'RESOURCES',
+ 							  'PRINT_FORMATTING',
+ 							  $map,
+ 							  $isProblem, '', $symbFilter,
+ 							  $start_new_option);
+ 	$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' modallink='1'",
+ 							'RESOURCES',
+ 							'PRINT_FORMATTING',
+ 							$url,
+ 							$isProblem, '',  $symbFilter,
+ 							$start_new_option);
+ # Generate student choosers.
-    <nextstate>PRINT_FORMATTING</nextstate>
-    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
-     <resource variable="RESOURCES" multichoice="1" addstatus="1"
-               closeallpages="1">
-       <filterfunc>return $isProblem;</filterfunc>
-       <mapurl>$map</mapurl>
-       <valuefunc>return $symbFilter;</valuefunc>
-       $start_new_option
-       </resource>
-     </state>
-     <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
-         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
-   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
+         &Apache::lonxml::xmlparse($r, 'helper',
-       <message><b>Select sorting order of printout</b> </message>
+ 				  &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',
-     <choices variable='student_sort'>
+ 							    'student_sort',
-       <choice computer='0'>Sort by section then student</choice>
+ 							    'STUDENTS',
-       <choice computer='1'>Sort by students across sections.</choice>
+ 							    'CHOOSE_STUDENTS_PAGE'));
-     </choices>
+ 	&Apache::lonxml::xmlparse($r, 'helper',
-       <message><br /><hr /><br /> </message>
+ 				  &generate_student_chooser('CHOOSE_STUDENTS',
-       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
+ 							    'student_sort',
-   </state>
+ 							    'STUDENTS',
-     $resource_selector
+ 							    'SELECT_PROBLEMS'));
- CHOOSE_STUDENTS
+ 	&Apache::lonxml::xmlparse($r, 'helper', $resource_selector);
  	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
  	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- Line 2900  CHOOSE_STUDENTS
+ Line 4504  CHOOSE_STUDENTS
  	if ($codechoice eq '') {
  	    $codechoice='<choice computer="default">Default</choice>';
  	}
-         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
+ 	my $anon1 = &generate_code_selector($helper,
-   <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">
+ 					    'CHOOSE_ANON1',
-     <nextstate>SELECT_PROBLEMS</nextstate>
+ 					    'SELECT_PROBLEMS',
-     <message><h4>Fill out one of the forms below</h4></message>
+ 					    $codechoice,
-     <message><br /><hr /> <br /></message>
+ 					    $code_selection,
-     <message><h3>Generate new CODEd Assignments</h3></message>
+ 					    $namechoice) . $resource_selector;
-     <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">
-        <validator>
+         &Apache::lonxml::xmlparse($r, 'helper',$anon1);
- 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
- 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+ 	my $anon_page = &generate_code_selector($helper,
-             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
+ 						'CHOOSE_ANON1_PAGE',
- 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+ 						'SELECT_PROBLEMS_PAGE',
- 	    return "You need to specify the number of assignments to print";
+ 						$codechoice,
- 	}
+ 						$code_selection,
- 	return undef;
+ 						$namechoice) .
-        </validator>
+ 			&generate_resource_chooser('SELECT_PROBLEMS_PAGE',
-     </string>
+ 						   'Select Problem(s) to print',
-     <message></td></tr><tr><td></message>
+ 						   "multichoice='1' addstatus='1' closeallpages ='1' modallink='1'",
-     <message><b>Names to save the CODEs under for later:</b></message>
+ 						   'RESOURCES',
-     <message></td><td></message>
+ 						   'PRINT_FORMATTING',
-     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+ 						   $url,
-     <message></td></tr><tr><td></message>
+ 						   $isProblem, '',  $symbFilter,
-     <message><b>Bubble sheet type:</b></message>
+ 						   $start_new_option);
-     <message></td><td></message>
+ 	&Apache::lonxml::xmlparse($r, 'helper', $anon_page);
-     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
-     $codechoice
-     </dropdown>
-     <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
-     <message></td></tr><tr><td></table></message>
-     <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
-     <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
-     <string variable="SINGLE_CODE" size="10">
-         <validator>
- 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
- 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
- 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
- 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
- 						      \$helper->{'VARS'}{'CODE_OPTION'});
- 	   } else {
- 	       return undef;	# Other forces control us.
- 	   }
-         </validator>
-     </string>
-     <message></td></tr><tr><td></message>
-         $code_selection
-     <message></td></tr></table></message>
-     <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
-     <message><b>Select saved CODEs:</b></message>
-     <message></td><td></message>
-     <dropdown variable="REUSE_OLD_CODES">
-         $namechoice
-     </dropdown>
-     <message></td></tr></table></message>
-   </state>
-   $resource_selector
- CHOOSE_ANON1
  	if ($helper->{VARS}->{'assignment'}) {
- 	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
- 	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
+ 	    # 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'];
  	}
  	$resource_selector=<<RESOURCE_SELECTOR;
      <state name="SELECT_RESOURCES" title="Select Resources">
      $randomly_ordered_warning
      <nextstate>PRINT_FORMATTING</nextstate>
      <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
      <resource variable="RESOURCES" multichoice="1" addstatus="1"
-               closeallpages="1">
+               closeallpages="1" modallink="1">
        <filterfunc>return $isNotMap;</filterfunc>
        <mapurl>$map</mapurl>
        <valuefunc>return $symbFilter;</valuefunc>
        $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'>
- Line 3020  CHOOSE_STUDENTS1
+ Line 4578  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'}                &&
- Line 3028  CHOOSE_STUDENTS1
+ Line 4586  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>
- Line 3036  CHOOSE_STUDENTS1
+ Line 4598  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
- Line 3051  CHOOSE_STUDENTS1
+ Line 4613  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.
  	   }
- Line 3082  CHOOSE_ANON2
+ Line 4646  CHOOSE_ANON2
  	    ))
  	&& $helper->{VARS}->{'assignment'} eq ""
  	) {
  	my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
-         push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+         push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from current subdirectory [_3]','<b>','</b>','<b><i>'.$pretty_dir.'</i></b>','<b>','</b>'), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
          my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
    <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
- Line 3119  CHOOSE_FROM_SUBDIR
+ Line 4682  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>
- Line 3128  CHOOSE_FROM_SUBDIR
+ Line 4691  CHOOSE_FROM_SUBDIR
    <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
      <message>(mark desired resources then click "next" button) <br /></message>
      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
-               closeallpages="1">
+               closeallpages="1" modallink="1">
        <nextstate>PAGESIZE</nextstate>
        <filterfunc>return $isNotMap</filterfunc>
        <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
- Line 3141  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4704  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();
- Line 3152  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4745  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>'
                     .&Apache::lonhtmlcommon::start_pick_box()
- #                  .&Apache::lonhtmlcommon::row_headline()
- #                  .'<h3>'.&mt('Print Options').'</h3>'
- #                  .&Apache::lonhtmlcommon::row_closure()
                     .&Apache::lonhtmlcommon::row_title(
                         '<label for="ANSWER_TYPE_forminput">'
                        .&mt('Print Answers')
- Line 3177  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4767  CHOOSE_FROM_ANY_SEQUENCE
          Apache::lonhelper::dropdown->new();
  	&addMessage(&Apache::lonhtmlcommon::row_closure());
  	$startedTable = 1;
+ #
+ #  Select font size.
+ #
+             $helper->declareVar('fontsize');
+             &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Font Size')));
+             my $xmlfrag = << "FONT_SELECTION";
+             <dropdown variable='fontsize' multichoice='0', allowempty='0'>
+             <defaultvalue>
+ 		  return 'normalsize';
+             </defaultvalue>
+             <choice computer='tiny'>Tiny</choice>
+             <choice computer='sub/superscriptsize'>Script Size</choice>
+             <choice computer='footnotesize'>Footnote Size</choice>
+             <choice computer='small'>Small</choice>
+             <choice computer='normalsize'>Normal (default)</choice>
+             <choice computer='large'>larger than normal</choice>
+             <choice computer='Large'>Even larger than normal</choice>
+             <choice computer='LARGE'>Still larger than normal</choice>
+             <choice computer='huge'>huge font size</choice>
+             <choice computer='Huge'>Largest possible size</choice>
+             </dropdown>
+ FONT_SELECTION
+             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+             &addMessage(&Apache::lonhtmlcommon::row_closure(1));
      }
      if ($perm{'pav'}) {
- Line 3276  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4894  CHOOSE_FROM_ANY_SEQUENCE
  	    $paramHash->{'multichoice'} = "true";
  	    $paramHash->{'allowempty'}  = "true";
  	    $paramHash->{'variable'}   = "showallfoils";
- 	    $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+ 	    $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ];
  	    Apache::lonhelper::choices->new();
              &addMessage(&Apache::lonhtmlcommon::row_closure(1));
  	}
- Line 3313  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4931  CHOOSE_FROM_ANY_SEQUENCE
  .qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
  .$selectfiletext.'</a>'
              .&Apache::lonhtmlcommon::row_closure()
-             .&Apache::lonhtmlcommon::row_title(&mt('Show all foils'))
+             .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils'))
              .'</message>
  	     <choices allowempty="1" multichoice="true" variable="showallfoils">
                  <choice computer="1">&nbsp;</choice>
- Line 3339  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4957  CHOOSE_FROM_ANY_SEQUENCE
  		   <choice computer="problem">Homework Problem</choice>
  		   <choice computer="exam">Exam Problem</choice>
  		   <choice computer="survey">Survey question</choice>
+                    ,choice computer="anonsurvey"Anonymous survey question</choice>
  		</dropdown>
  PROBTYPE
              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
              &addMessage(&Apache::lonhtmlcommon::row_closure(1));
          }
      }
- Line 3372  PROBTYPE
+ Line 4992  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;
- Line 3451  sub render {
+ Line 5073  sub render {
      my $PaperType=&mt('Paper type');
      my $landscape=&mt('Landscape');
      my $portrait=&mt('Portrait');
      $result.='<h3>'.&mt('Layout Options').'</h3>'
              .&Apache::loncommon::start_data_table()
              .&Apache::loncommon::start_data_table_header_row()
- Line 3470  sub render {
+ Line 5094  sub render {
      my $i;
      for ($i = 1; $i <= $maxColumns; $i++) {
          if ($i == 2) {
-             $result .= "<option value='$i' selected>$i</option>\n";
+             $result .= '<option value="'.$i.'" selected="selected">'.$i.'</option>'."\n";
          } else {
-             $result .= "<option value='$i'>$i</option>\n";
+             $result .= '<option value="'.$i.'">'.$i.'</option>'."\n";
          }
      }
- Line 3488  sub render {
+ Line 5112  sub render {
  	$_=~/(\w+)/;
  	my $papersize=$1;
          if ($paperSize[$i]=~/$DefaultPaperSize/) {
-             $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
+             $result .= '<option selected="selected" value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
          } else {
-             $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
+             $result .= '<option value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
          }
          $i++;
      }
- Line 3511  sub postprocess {
+ Line 5135  sub postprocess {
      my $helper = Apache::lonhelper->getHelper();
      $helper->{VARS}->{$var} =
          $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
-         $env{"form.$var.paper"};
+         $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
      return 1;
  }
- Line 3589  sub render {
+ Line 5213  sub render {
      my ($laystyle, $cols, $papersize) = split(/\|/, $format);
      ($papersize)                      = split(/ /, $papersize);
+     $laystyle = &Apache::lonprintout::map_laystyle($laystyle);
-     if ($laystyle eq 'L') {
- 	$laystyle = 'album';
-     } else {
- 	$laystyle = 'book';
-     }
      my %size;
- Line 3623  sub render {
+ Line 5243  sub render {
      }  else {
  	$size{'margin'} += 2.54;
      }
-     my %text = ('format' => 'How should each column be formatted?',
+     my %lt = &Apache::lonlocal::texthash(
- 		'width'  => 'Width:',
+         'format' => 'How should each column be formatted?',
- 		'height' => 'Height:',
+         'width'  => 'Width',
- 		'margin' => 'Left Margin:',);
+         'height' => 'Height',
-     %text = &Apache::lonlocal::texthash(%text);
+         'margin' => 'Left Margin'
+     );
-     $result .= <<ELEMENTHTML;
+     $result .= '<p>'.$lt{'format'}.'</p>'
- <p>$text{'format'}</p>
+               .&Apache::lonhtmlcommon::start_pick_box()
+               .&Apache::lonhtmlcommon::row_title($lt{'width'})
- <table cellpadding='3'>
+               .'<input type="text" name="'.$var.'.width" value="'.$size{'width'}.'" size="4" />'
-   <tr>
+               .'<select name="'.$var.'.widthunit">'
-     <td align='right'><b>$text{'width'}</b></td>
+               .$size{'width_options'}
-     <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
+               .'</select>'
-     <td align='left'>
+               .&Apache::lonhtmlcommon::row_closure()
-       <select name='$var.widthunit'>
+               .&Apache::lonhtmlcommon::row_title($lt{'height'})
-       $size{'width_options'}
+               .'<input type="text" name="'.$var.'.height" value="'.$size{'height'}.'" size="4" />'
-       </select>
+               .'<select name="'.$var.'.heightunit">'
-     </td>
+               .$size{'height_options'}
-   </tr>
+               .'</select>'
-   <tr>
+               .&Apache::lonhtmlcommon::row_closure()
-     <td align='right'><b>$text{'height'}</b></td>
+               .&Apache::lonhtmlcommon::row_title($lt{'margin'})
-     <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
+               .'<input type="text" name="'.$var.'.lmargin" value="'.$size{'margin'}.'" size="4" />'
-     <td align='left'>
+               .'<select name="'.$var.'.lmarginunit">'
-       <select name='$var.heightunit'>
+               .$size{'margin_options'}
-       $size{'height_options'}
+               .'</select>'
-       </select>
+               .&Apache::lonhtmlcommon::row_closure(1)
-     </td>
+               .&Apache::lonhtmlcommon::end_pick_box();
-   </tr>
+     # <p>Hint: Some instructors like to leave scratch space for the student by
-   <tr>
+     # making the width much smaller than the width of the page.</p>
-     <td align='right'><b>$text{'margin'}</b></td>
-     <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
-     <td align='left'>
-       <select name='$var.lmarginunit'>
-       $size{'margin_options'}
-       </select>
-     </td>
-   </tr>
- </table>
- <!--<p>Hint: Some instructors like to leave scratch space for the student by
- making the width much smaller than the width of the page.</p>-->
- ELEMENTHTML
      return $result;
  }
- Line 3689  sub preprocess {
+ Line 5295  sub preprocess {
  	($papersize)                      = split(/ /, $papersize);
- 	if ($laystyle eq 'L') {
+ 	$laystyle = &Apache::lonprintout::map_laystyle($laystyle);
- 	    $laystyle = 'album';
- 	} else {
- 	    $laystyle = 'book';
- 	}
  	#  Figure out some good defaults for the print out and set them:
  	my %size;
- Line 3763  sub postprocess {
+ Line 5366  sub postprocess {
      }
  }
  __END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.545.2.5
changed lines
	Added in v.1.627.2.24