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.575.2.1 and 1.642

-version 1.575.2.1, 2010/05/10 10:21:24
+version 1.642, 2014/04/24 15:31:39
  Line 1
- #
  # The LearningOnline Network
  # Printout
  #
- Line 41  use Apache::admannotations;
+ Line 40  use Apache::admannotations;
  use Apache::lonenc;
  use Apache::entities;
  use Apache::londefdef;
+ # use Apache::structurelags;	# for language management.
  use File::Basename;
  use HTTP::Response;
  use LONCAPA::map();
- use POSIX qw(strftime);
  use Apache::lonlocal;
  use Carp;
  use LONCAPA;
  my %perm;
  my %parmhash;
  my $resources_printed;
- Line 59  my $resources_printed;
+ Line 58  my $resources_printed;
  # Global variables that describe errors in ssi calls detected  by ssi_with_retries.
  #
- my $ssi_error;                  # True if there was an ssi error.
+ my $ssi_error;			# True if there was an ssi error.
- my $ssi_last_error_resource;    # The resource URI that could not be fetched.
+ my $ssi_last_error_resource;	# The resource URI that could not be fetched.
- my $ssi_last_error
+ my $ssi_last_error;		# The error text from the server. (e.g. 500 Server timed out).
-   ;    # The error text from the server. (e.g. 500 Server timed out).
  #
  #  Our ssi max retry count.
  #
- my $ssi_retry_count = 5;    # Some arbitrary value.
+ my $ssi_retry_count = 5;	# Some arbitrary value.
  #  Font size:
- my $font_size = 'normalsize';    # Default is normalsize...
+ my $font_size = 'normalsize';	# Default is normalsize...
  #----------------------------  Helper helpers. -------------------------
- #  Returns the text needd for a student chooser.
+ ##
+ # Filter function to determine if a resource is a printable sequence.
+ #
+ # @param $res -Resource to check.
+ #
+ # @return 1 - printable and a resource
+ #         0 - either notm a sequence or not printable.
+ #
+ sub printable_sequence {
+     my $res = shift;
+     # Non-sequences are not listed:
+     if (!$res->is_sequence()) {
+ 	return 0;
+     }
+     # Person with pav or pfo can always print:
+     if ($perm{'pav'} || $perm{'pfo'}) {
+ 	return 1;
+     }
+     if ($res->is_sequence()) {
+ 	my $symb = $res->symb();
+ 	my $navmap   = $res->{NAV_MAP};
+ 	# Find the first resource in the map:
+ 	my $iterator = $navmap->getIterator($res, undef, undef, 1, 1);
+ 	my $first    = $iterator->next();
+ 	while (1) {
+ 	    if ($first == $iterator->END_ITERATOR) { last; }
+ 	    if (ref($first) && ! $first->is_sequence()) {last; }
+ 	    $first = $iterator->next();
+ 	}
+ 	# Might be an empty map:
+ 	if (!ref($first)) {
+ 	    return 0;
+ 	}
+ 	my $partsref = $first->parts();
+ 	my @parts    = @$partsref;
+ 	my ($open, $close) = $navmap->map_printdates($first, $parts[0]);
+ 	return &printable($open, $close);
+     }
+     return 0;
+ }
+ # BZ5209:
+ #    Create the states needed to run the helper for incomplete problems from
+ #    the current folder for selected students.
+ #    This includes:
+ #    -  A resource selector limited to problems (incompleteness must be
+ #       calculated on a student per student basis.
+ #    -  A student selector.
+ #    -  Tie in to the FORMAT of the print job.
+ #
+ # States:
+ #   CHOOSE_INCOMPLETE_PEOPLE_SEQ      - Resource selection.
+ #   CHOOSE_STUDENTS_INCOMPLETE        - Student selection.
+ #   CHOOSE_STUDENTS_INCOMPLETE_FORMAT - Format selection
+ # Parameters:
+ #    helper - the helper which already contains info about the current folder we can
+ #             purloin.
+ #    url    - Top url of the sequence
+ # Return:
+ #     XML that can be parsed by the helper to drive the state machine.
+ #
+ sub create_incomplete_folder_selstud_helper {
+     my ($helper, $map)  = @_;
+     my $symbFilter = '$res->shown_symb()';
+     my $selFilter   = '$res->is_problem()';
+     my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_PEOPLE_SEQ',
+ 						      'Select problem(s) to print',
+ 						      'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+ 						      'RESOURCES',
+ 						      'CHOOSE_STUDENTS_INCOMPLETE',
+ 						      $map,
+ 						      $selFilter,
+ 						      '',
+ 						      $symbFilter,
+ 						      '');
+     my $student_chooser = &generate_student_chooser('CHOOSE_STUDENTS_INCOMPLETE',
+ 						 'student_sort',
+ 						 'STUDENTS',
+ 						 'CHOOSE_STUDENTS_INCOMPLETE_FORMAT');
+     my $format_chooser = &generate_format_selector($helper,
+ 						'Format of the print job',
+ 						'CHOOSE_STUDENTS_INCOMPLETE_FORMAT'); # end state.
+     return $resource_chooser . $student_chooser . $format_chooser;
+ }
+ # BZ 5209
+ #     Create the states needed to run the helper for incomplete problems from
+ #     the current folder for selected students.
+ #     This includes:
+ #     - A resource selector limited to problems.  (incompleteness must be calculated
+ #       on a student per student basis.
+ #     - A student selector.
+ #     - Tie in to format for the print job.
+ # States:
+ #    INCOMPLETE_PROBLEMS_COURSE_RESOURCES - Resource selector.
+ #    INCOMPLETE_PROBLEMS_COURSE_STUDENTS  - Student selector.
+ #    INCOMPLETE_PROBLEMS_COURSE_FORMAT    - Format selection.
+ #
+ # Parameters:
+ #   helper   - Helper we are creating states for.
+ # Returns:
+ #   Text that can be parsed by the helper.
+ #
+ sub create_incomplete_course_helper {
+     my $helper = shift;
+     my $filter = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
+     my $symbfilter = '$res->shown_symb()';
+     my $resource_chooser = &generate_resource_chooser('INCOMPLETE_PROBLEMS_COURSE_RESOURCES',
+ 						      'Select problem(s) to print',
+ 						      'multichoice = "1" suppressEmptySequences="0" addstatus="1" closeallpagtes="1"',
+ 						      'RESOURCES',
+ 						      'INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
+ 						      '',
+ 						      $filter,
+ 						      '',
+ 						      $symbfilter,
+ 						      '');
+     my $people_chooser  = &generate_student_chooser('INCOMPLETE_PROBLEMS_COURSE_STUDENTS',
+ 						    'student_sort',
+ 						    'STUDENTS',
+ 						    'INCOMPLETE_PROBLEMS_COURSE_FORMAT');
+     my $format = &generate_format_selector($helper,
+ 					   'Format of the print job',
+ 					   'INCOMPLETE_PROBLEMS_COURSE_FORMAT'); # end state.
+     return $resource_chooser . $people_chooser . $format;
+ }
+ # BZ5209
+ #   Creates the states needed to run the print helper for a student
+ #   that wants to print his incomplete problems from the current folder.
+ # Parameters:
+ #   $helper - helper we are generating states for.
+ #   $map    - The map for which the student wants incomplete problems.
+ # Returns:
+ #   XML that defines the helper states being created.
+ #
+ # States:
+ #   CHOOSE_INCOMPLETE_SEQ  - Resource selector.
+ #
+ sub create_incomplete_folder_helper {
+     my ($helper, $map) = @_;
+     my $filter    = '$res->is_problem()';
+     $filter      .= ' && $res->resprintable() ';
+     $filter      .= ' && $res->is_incomplete() ';
+     my $symfilter = '$res->shown_symb()';
+     my $resource_chooser = &generate_resource_chooser('CHOOSE_INCOMPLETE_SEQ',
+ 						      'Select problem(s) to print',
+ 						      'multichoice="1", toponly ="1", addstatus="1", closeallpages="1"',
+ 						      'RESOURCES',
+ 						      'PAGESIZE',
+ 						      $map,
+ 						      $filter, '',
+ 						      $symfilter,
+ 						      '');
+     return $resource_chooser;
+ }
+ #  Returns the text neded for a student chooser.
  #  that text must still be parsed by the helper xml parser.
  # Parameters:
  #   this_state   - State name of the chooser.
- Line 84  my $font_size = 'normalsize';    # Defau
+ Line 272  my $font_size = 'normalsize';    # Defau
  #   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 ($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>
- Line 104  sub generate_student_chooser {
+ Line 296  sub generate_student_chooser {
  CHOOSE_STUDENTS
-     return $result;
+   return $result;
  }
  # Generate the text needed for a resource chooser given the top level of
- Line 125  CHOOSE_STUDENTS
+ Line 317  CHOOSE_STUDENTS
  #     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 (
+     my ($this_state,
-         $this_state, $prompt_text, $resource_options,
+ 	$prompt_text,
-         $variable,   $next_state,  $top_url,
+ 	$resource_options,
-         $filter,     $choice_func, $value_func,
+ 	$variable,
-         $start_new_option
+ 	$next_state,
-     ) = @_;
+ 	$top_url,
+ 	$filter,
+ 	$choice_func,
+ 	$value_func,
+ 	$start_new_option)  = @_;
      my $result = <<CHOOSE_RESOURCES;
  <state name="$this_state" title="$prompt_text">
- Line 144  sub generate_resource_chooser {
+ Line 340  sub generate_resource_chooser {
        <nextstate>$next_state</nextstate>
        <filterfunc>return $filter;</filterfunc>
  CHOOSE_RESOURCES
-     if ( $choice_func ne '' ) {
+     if ($choice_func ne '') {
-         $result .= "<choicefunc>return $choice_func;</choicefunc>";
+ 	$result .= "<choicefunc>return $choice_func;</choicefunc>";
      }
-     if ( $top_url ne '' ) {
+     if ($top_url ne '') {
-         $result .= "<mapurl>$top_url</mapurl>";
+ 	$result .=  "<mapurl>$top_url</mapurl>";
      }
      $result .= <<CHOOSE_RESOURCES;
        <valuefunc>return $value_func;</valuefunc>
- Line 156  CHOOSE_RESOURCES
+ Line 352  CHOOSE_RESOURCES
        </resource>
      </state>
  CHOOSE_RESOURCES
      return $result;
  }
  #
  #   Generate the helper XML for a code choice helper dialog:
  #
- Line 175  CHOOSE_RESOURCES
+ Line 369  CHOOSE_RESOURCES
  #   The Xml of the code chooser.
  #
  sub generate_code_selector {
-     my ( $helper, $state, $next_state, $bubble_types, $code_selections,
+     my ($helper,
-         $saved_codes )
+ 	$state,
-       = @_;    # Unpack the parameters.
+ 	$next_state,
+ 	$bubble_types,
+ 	$code_selections,
+ 	$saved_codes) = @_;	# Unpack the parameters.
      my $result = <<CHOOSE_ANON1;
    <state name="$state" title="Specify CODEd Assignments">
- Line 186  sub generate_code_selector {
+ Line 383  sub generate_code_selector {
      <message><br /><hr /> <br /></message>
      <message><h3>Generate new CODEd Assignments</h3></message>
      <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
-     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"  noproceed="1">
         <validator>
  	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
  	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
              !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
- 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+ 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'} ) {
  	    return "You need to specify the number of assignments to print";
  	}
+         if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) >= 1)  &&
+              (\$helper->{'VARS'}{'SINGLE_CODE'} ne '') ) {
+             return 'Specifying number of codes to print and a specific code is not compatible';
+         }
  	return undef;
         </validator>
      </string>
- Line 202  sub generate_code_selector {
+ Line 404  sub generate_code_selector {
      <message></td><td></message>
      <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
      <message></td></tr><tr><td></message>
-     <message><b>Bubble sheet type:</b></message>
+     <message><b>Bubblesheet type:</b></message>
      <message></td><td></message>
      <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
      $bubble_types
- Line 218  sub generate_code_selector {
+ Line 420  sub generate_code_selector {
  	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
  	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
  						      \$helper->{'VARS'}{'CODE_OPTION'});
+ 	  } elsif (\$helper->{'VARS'}{'SINGLE_CODE'} ne ''){
+ 	      return 'Specifying a code name is incompatible with specifying number of codes.';
  	   } else {
  	       return undef;	# Other forces control us.
  	   }
- Line 236  sub generate_code_selector {
+ Line 440  sub generate_code_selector {
    </state>
  CHOOSE_ANON1
-     return $result;
+    return $result;
+ }
+ #  Returns the XML for choosing how assignments are to be formatted
+ #  that text must still be parsed by the helper xml parser.
+ # Parameters: 3 (required)
+ #   helper       - The helper; $helper->{'VARS'}->{'PRINT_TYPE'} used
+ #                  to check if splitting PDFs by section can be offered.
+ #   title        - Title for the current state.
+ #   this_state   - State name of the chooser.
+ sub generate_format_selector {
+     my ($helper,$title,$this_state) = @_;
+     my $secpdfoption;
+     unless (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
+         $secpdfoption =  '<choice computer="sections">Each PDF contains exactly one section</choice>';
+     }
+     return <<RESOURCE_SELECTOR;
+     <state name="$this_state" title="$title">
+     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
+     <choices variable="EMPTY_PAGES">
+       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
+       <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
+       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
+       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
+     </choices>
+     <nextstate>PAGESIZE</nextstate>
+     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
+     <choices variable="SPLIT_PDFS">
+        <choice computer="all">All assignments in a single PDF file</choice>
+        $secpdfoption
+        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
+        <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+             Specify the number of assignments per PDF:</choice>
+     </choices>
+     </state>
+ RESOURCE_SELECTOR
  }
  #-----------------------------------------------------------------------
+ # Computes an open and close date from a list of open/close dates for a resource's
+ # parts.
+ #
+ # @param \@opens - reference to an array of open dates.
+ # @param \@closes - reference to an array of close dates.
+ #
+ # @return ($open, $close)
+ #
+ # @note If open/close dates are not defined they will be returned as undef
+ # @note It is possible for there to be no overlap in which case -1,-1
+ #       will be returned.
+ # @note The algorithm used is to take the latest open date and the earliest end date.
+ #
+ sub compute_open_window {
+     my ($opensref, $closesref) = @_;
+     my @opens   = @$opensref;
+     my @closes  = @$closesref;
+     # latest open date:
+     my $latest_open;
+     foreach my $open (@opens) {
+ 	if (!defined($latest_open) || ($open > $latest_open)) {
+ 	    $latest_open = $open;
+ 	}
+     }
+     # Earliest close:
+     my $earliest_close;
+     foreach my $close (@closes) {
+ 	if (!defined($earliest_close) || ($close < $earliest_close)) {
+ 	    $earliest_close = $close;
+ 	}
+     }
+     # If no overlap...both are -1 as promised.
+     if (($earliest_close ne '') && ($latest_open ne '')
+ 	 && ($earliest_close < $latest_open)) {
+ 	$latest_open  = -1;
+ 	$earliest_close = -1;
+     }
+     return ($latest_open, $earliest_close);
+ }
+ ##
+ #  Determines if 'now' is within the set of printable dates.
+ #
+ #  @param $open_date - Starting date/timestamp.
+ #  @param $close_date - Ending date/timestamp.
+ #
+ #  @return 0 - Not open.
+ #  @return 1 - open.
+ #
+ sub printable {
+     my ($open_date, $close_date) = @_;
+     my $now = time();
+     # Have to do a bit of fancy footwork around undefined open/close dates:
+     if ($open_date && ($open_date > $now)) {
+ 	return 0;
+     }
+     if ($close_date && ($close_date < $now)) {
+ 	return 0;
+     }
+     return 1;
+ }
+ ##
+ # Returns the innermost print start/print end dates for a resource.
+ # This is done by looking at the start/end dates for its parts and choosing
+ # the intersection of those dates.
+ #
+ # @param res - lonnvamaps::resource object that represents the resource.
+ #
+ # @return (opendate, closedate)
+ #
+ # @note If open/close dates are not defined they will be returned as undef
+ # @note It is possible for there to be no overlap in which case -1,-1
+ #       will be returned.
+ # @note The algorithm used is to take the latest open date and the earliest end date.
+ #       For consistency with &printable() in lonnavmaps.pm determination of start
+ #       date for printing checks printstartdate param first, then, if not set,
+ #       opendate param, then, if not set, contentopen param.
+ sub get_print_dates {
+     my $res = shift;
+     my $partsref = $res->parts();
+     my @parts;
+     if (ref($partsref) eq 'ARRAY') {
+         @parts   = @{$partsref};
+     }
+     my $open_date;
+     my $close_date;
+     my @open_dates;
+     my @close_dates;
+     if (@parts) {
+ 	foreach my $part (@parts) {
+ 	    my $partopen  = $res->parmval('printstartdate', $part);
+ 	    my $partclose = $res->parmval('printenddate',  $part);
+             if (!$partopen) {
+                 $partopen = $res->parmval('opendate',$part);
+             }
+             if (!$partopen) {
+                 $partopen = $res->parmval('contentopen',$part);
+             }
+             if ($partopen) {
+                 push(@open_dates, $partopen);
+             }
+             if ($partclose) {
+                 push(@close_dates, $partclose);
+             }
+ 	    push(@open_dates, $partopen);
+ 	    push(@close_dates, $partclose);
+ 	}
+     }
+     ($open_date, $close_date)  = &compute_open_window(\@open_dates, \@close_dates);
+     return ($open_date, $close_date);
+ }
+ ##
+ # Get the dates for which a course says a resource can be printed.  This is like
+ # get_print_dates but namvaps::course_print_dates are gotten...and not converted
+ # to times either.
+ #
+ # @param $res - Reference to a resource has from lonnvampas::resource.
+ #
+ # @return (opendate, closedate)
+ #
+ sub course_print_dates {
+     my $res = shift;
+     my $partsref = $res->parts();
+     my @parts    = @$partsref;
+     my $open_date;
+     my $close_date;
+     my @open_dates;
+     my @close_dates;
+     my $navmap = $res->{NAV_MAP}; # Slightly OO dirty.
+     # Don't bother looping over undefined or empty parts arraY;
+     if (@parts) {
+ 	foreach my $part (@parts) {
+ 	    my ($partopen, $partclose) = $navmap->course_printdates($res, $part);
+ 	    push(@open_dates, $partopen);
+ 	    push(@close_dates, $partclose);
+ 	}
+ 	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
+     }
+     return ($open_date, $close_date);
+ }
+ ##
+ # Same as above but for the enclosing map:
+ #
+ sub map_print_dates {
+     my $res = shift;
+     my $partsref = $res->parts();
+     my @parts    = @$partsref;
+     my $open_date;
+     my $close_date;
+     my @open_dates;
+     my @close_dates;
+     my $navmap = $res->{NAV_MAP}; # slightly OO dirty.
+     # Don't bother looping over undefined or empty parts arraY;
+     if (@parts) {
+ 	foreach my $part (@parts) {
+ 	    my ($partopen, $partclose) = $navmap->map_printdates($res, $part);
+ 	    push(@open_dates, $partopen);
+ 	    push(@close_dates, $partclose);
+ 	}
+ 	($open_date, $close_date) = &compute_open_window(\@open_dates, \@close_dates);
+     }
+     return ($open_date, $close_date);
+ }
+ # Determine if a resource is incomplete given the map:
+ # Parameters:
+ #   $username - Name of user for whom we are checking.
+ #   $domain   - Domain of user we are checking.
+ #   $map - map name.
+ # Returns:
+ #     0 - map is not incomplete.
+ #     1 - map is incomplete.
+ #
+ sub incomplete {
+     my ($username, $domain, $map) = @_;
+     my $navmap = Apache::lonnavmaps::navmap->new($username, $domain);
+     if (defined($navmap)) {
+ 	my $res = $navmap->getResourceByUrl($map);
+ 	my $result = $res->is_incomplete();
+ 	return $result;
+     } else {
+ 	return 1;
+     }
+ }
+ #
+ #  When printing for students, the resoures and order of the
+ #  resources may need to be altered if there are folders with
+ #  random selectiopn or random ordering (or both) enabled.
+ #  This sub computes the set of resources to print for a student
+ #  modified both by random ordering and selection and filtered
+ #  to only those that are in the original set selcted to be printed.
+ #
+ # Parameters:
+ #   $map - The URL of the folder being printed.
+ #          Used to determine which startResource and finishResource
+ #          to use when using the navmap's getIterator method.
+ #   $seq   - The original set of resources to print.
+ #            (really an array of resource names (array of symb's).
+ #   $who   - Student/domain for whome the sequence will be generated.
+ #   $code  - CODE being printed when printing Problems/Resources
+ #            from folder for CODEd assignments
+ #
+ # Implicit inputs:
+ #   $
+ # Returns:
+ #   reference to an array of resources that can be passed to
+ #   print_resources.
+ #
+ sub master_seq_to_person_seq {
+     my ($map, $seq, $who, $code, $nohidemap) = @_;
+     my ($username, $userdomain, $usersection) = split(/:/, $who);
+     # Toss the sequence up into a hash so that we have O(1) lookup time.
+     # on the items that come out of the user's list of resources.
+     #
+     my %seq_hash = map {$_  => 1} @$seq;
+     my @output_seq;
+     my $unhidden;
+     if ($perm{'pav'} && $perm{'vgr'} && $nohidemap) {
+         $unhidden = &Apache::lonnet::clutter($map);
+     }
+     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain,
+                                                            $code, $unhidden);
+     my ($start,$finish);
+     if ($map) {
+         my $mapres = $navmap->getResourceByUrl($map);
+         if ($mapres->is_map()) {
+             $start = $mapres->map_start();
+             $finish = $mapres->map_finish();
+         }
+     }
+     unless ($start && $finish) {
+         $start = $navmap->firstResource();
+         $finish = $navmap->finishResource();
+     }
+     my $iterator         = $navmap->getIterator($start,$finish,{},1);
+     #  Iterate on the resource..select the items that are randomly selected
+     #  and that are in the seq_has.  Presumably the iterator will take care
+     # of the random ordering part of the deal.
+     #
+     my $curres;
+     while ($curres = $iterator->next()) {
+ 	#
+ 	#  Only process resources..that are not removed by randomout...
+ 	#  and are selected for printint as well.
+ 	#
+         if (ref($curres) && ! $curres->randomout()) {
+             my $currsymb = $curres->symb();
+             if (exists($seq_hash{$currsymb})) {
+                 push(@output_seq, $currsymb);
+ 	    }
+ 	}
+     }
+     return \@output_seq;		# for now.
+ }
  # Fetch the contents of a resource, uninterpreted.
  # This is used here to fetch a latex file to be included
  # verbatim into the printout<
- Line 252  CHOOSE_ANON1
+ Line 793  CHOOSE_ANON1
  sub fetch_raw_resource {
      my ($url) = @_;
-     my $filename = &Apache::lonnet::filelocation( "", $url );
+     my $filename  = &Apache::lonnet::filelocation("", $url);
-     my $contents = &Apache::lonnet::getfile($filename);
+     my $contents  = &Apache::lonnet::getfile($filename);
-     if ( $contents == -1 ) {
+     if ($contents == -1) {
-         return "File open failed for $filename";    # This will bomb the print.
+ 	return "File open failed for $filename";      # This will bomb the print.
      }
      return $contents;
  }
  #  Fetch the annotations associated with a URL and
  #  put a centered 'annotations:' title.
  #  This is all suppressed if the annotations are empty.
  #
  sub annotate {
      my ($symb) = @_;
-     my $annotation_text = &Apache::loncommon::get_annotation( $symb, 1 );
+     my $annotation_text = &Apache::loncommon::get_annotation($symb, 1);
      my $result = "";
-     if ( length($annotation_text) > 0 ) {
+     if (length($annotation_text) > 0) {
-         $result .=
+ 	$result .= '\\hspace*{\\fill} \\\\[\\baselineskip] \textbf{Annotations:} \\\\ ';
-           '\\hspace*{\\fill} \\\\[\\baselineskip] \textbf{Annotations:} \\\\ ';
+ 	$result .= "\n";
-         $result .= "\n";
+ 	$result .= &Apache::lonxml::latex_special_symbols($annotation_text,"");	# Escape latex.
-         $result .=
+ 	$result .= "\n\n";
-           &Apache::lonxml::latex_special_symbols( $annotation_text, "" )
-           ;    # Escape latex.
-         $result .= "\n\n";
      }
      return $result;
  }
- Line 300  sub set_font_size {
+ Line 840  sub set_font_size {
      # 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 '' ) {
+     if ($font_size ne '') {
-         $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
+ 	$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).
- Line 318  sub set_font_size {
+ Line 859  sub set_font_size {
  #
  # Parameters:
  #   pdf_uri   - URI of the PDF file to include.
  #
  # Returns:
  #  The LaTeX to include.
  #
- Line 332  sub include_pdf {
+ Line 873  sub include_pdf {
      # Where is the file? If not local we'll need to repcopy it:'
-     my $file = &Apache::lonnet::filelocation( '', $pdf_uri );
+     my $file = &Apache::lonnet::filelocation('', $pdf_uri);
-     if ( !-e $file ) {
+     if (! -e $file) {
-         &Apache::lonnet::repcopy($file);
+ 	&Apache::lonnet::repcopy($file);
-         $file = &Apache::lonnet::filelocation( '', $pdf_uri );
+ 	$file = &Apache::lonnet::filelocation('',$pdf_uri);
      }
-   #  The file isn ow replicated locally.. or it did not exist in the first place
+     #  The file isn ow replicated locally.. or it did not exist in the first place
-   # (unlikely).  If it did exist, add the pdf to the set of files/images that
+     # (unlikely).  If it did exist, add the pdf to the set of files/images that
-   # need tob e converted for this print job:
+     # need tob e converted for this print job:
-     $file =~ s|(.*)/res/|/home/httpd/html/res/|;
+     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+     $file =~ s{(.*)/res/}{$londocroot/res/};
-     open( FILE,
+     open(FILE,">>$Apache::lonnet::perlvar{'lonPrtDir'}/$env{'user.name'}_$env{'user.domain'}_printout.dat");
- ">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat"
-     );
      print FILE ("$file\n");
-     close(FILE);
+     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 ( $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 .=
+     $output    .= '\special{ps: _begin_job_ ('
-       '\special{ps: _begin_job_ (' . $base . '.pdf.eps' . ')run _end_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.
- Line 374  sub include_pdf {
+ Line 939  sub include_pdf {
  #                      the number of times requested by the caller.
  #                      If we still have a proble, no text is appended to the
  #                      output and we set some global variables.
  #                      to indicate to the caller an SSI error occurred.
  #                      All of this is supposed to deal with the issues described
  #                      in LonCAPA BZ 5631 see:
  #                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
- Line 384  sub include_pdf {
+ Line 949  sub include_pdf {
  #   resource   - The resource to include.  This is passed directly, without
  #                interpretation to lonnet::ssi.
  #   form       - The form hash parameters that guide the interpretation of the resource
  #
  #   retries    - Number of retries allowed before giving up completely.
  # Returns:
  #   On success, returns the rendered resource identified by the resource parameter.
- Line 400  sub include_pdf {
+ Line 965  sub include_pdf {
  #                               in the event of an error.
  #
  sub ssi_with_retries {
-     my ( $resource, $retries, %form ) = @_;
+     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 ) {
+     my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
-         $ssi_error               = 1;
+     if (!$response->is_success) {
-         $ssi_last_error_resource = $resource;
+ 	$ssi_error               = 1;
-         $ssi_last_error          = $response->code . " " . $response->message;
+ 	$ssi_last_error_resource = $resource;
-         $content                 = '\section*{!!! An error occurred !!!}';
+ 	$ssi_last_error          = $response->code . " " . $response->message;
-         &Apache::lonnet::logthis(
+         $content='\section*{!!! An error occurred !!!}';
-             "Error in SSI resource: $resource Error: $ssi_last_error");
      }
      return $content;
- Line 421  sub ssi_with_retries {
+ Line 985  sub ssi_with_retries {
  }
  sub get_student_view_with_retries {
-     my (
+     my ($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv)=@_;
-         $curresline, $retries, $username, $userdomain,
-         $courseid,   $target,  $moreenv
+     my ($content, $response) = &Apache::loncommon::get_student_view_with_retries($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv);
-     ) = @_;
+     if (!$response->is_success) {
+         $ssi_error               = 1;
-     my ( $content, $response ) =
+         $ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
-       &Apache::loncommon::get_student_view_with_retries(
+         $ssi_last_error          = $response->code . " " . $response->message;
-         $curresline, $retries, $username, $userdomain,
+         $content='\section*{!!! An error occurred !!!}';
-         $courseid,   $target,  $moreenv
-       );
-     if ( !$response->is_success ) {
-         $ssi_error = 1;
-         $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 447  sub get_student_view_with_retries {
+ Line 1000  sub get_student_view_with_retries {
  #
  #   printf_style_subst  item format_string repl
  #
  # Does printf style substitution for a format string that
  # can have %[n]item in it.. wherever, %[n]item occurs,
  # rep is substituted in format_string.  Note that
  # [n] is an optional integer length.  If provided,
  # repl is truncated to at most [n] characters prior to
  # substitution.
  #
  sub printf_style_subst {
-     my ( $item, $format_string, $repl ) = @_;
+     my ($item, $format_string, $repl) = @_;
      my $result = "";
-     while ( $format_string =~ /(%)(\d*)\Q$item\E/g ) {
+     while ($format_string =~ /(%)(\d*)\Q$item\E/g ) {
-         my $fmt   = $1;
+ 	my $fmt = $1;
-         my $size  = $2;
+ 	my $size = $2;
-         my $subst = $repl;
+ 	my $subst = $repl;
-         if ( $size ne "" ) {
+ 	if ($size ne "") {
-             $subst = substr( $subst, 0, $size );
+ 	    $subst = substr($subst, 0, $size);
-             #  Here's a nice edge case.. supose the end of the
+ 	    #  Here's a nice edge case.. supose the end of the
-             #  substring is a \.  In that case may have  just
+ 	    #  substring is a \.  In that case may have  just
-             #  chopped off a TeX escape... in that case, we append
+ 	    #  chopped off a TeX escape... in that case, we append
-             #   " " for the trailing character, and let the field
+ 	    #   " " for the trailing character, and let the field
-             #  spill over a bit (sigh).
+ 	    #  spill over a bit (sigh).
-             #  We don't just chop off the last character in order to deal
+ 	    #  We don't just chop off the last character in order to deal
-             #  with one last pathology, and that would be if substr had
+ 	    #  with one last pathology, and that would be if substr had
-             #  trimmed us to e.g. \\\
+ 	    #  trimmed us to e.g. \\\
-             if ( $subst =~ /\\$/ ) {
-                 $subst .= " ";
+ 	    if ($subst =~ /\\$/) {
-             }
+ 		$subst .= " ";
-         }
+ 	    }
-         my $item_pos = pos($format_string);
+ 	}
-         $result .=
+ 	my $item_pos = pos($format_string);
-           substr( $format_string, 0, $item_pos - length($size) - 2 ) . $subst;
+ 	$result .= substr($format_string, 0, $item_pos - length($size) -2) . $subst;
-         $format_string = substr( $format_string, pos($format_string) );
+         $format_string = substr($format_string, pos($format_string));
      }
      # Put the residual format string into the result:
- Line 491  sub printf_style_subst {
+ Line 1044  sub printf_style_subst {
      return $result;
  }
- # Format a header according to a format.
- #
+ # Format a header according to a format.
+ #
  # Substitutions:
  #     %a    - Assignment name.
- Line 501  sub printf_style_subst {
+ Line 1055  sub printf_style_subst {
  #     %s    - The section if it is supplied.
  #
  sub format_page_header {
-     my ( $width, $format, $assignment, $course, $student, $section ) = @_;
+     my ($width, $format, $assignment, $course, $student, $section) = @_;
-     $width = &recalcto_mm($width);    # Get width in mm.
-     my $chars_per_line = int( $width / 1.6 );    # Character/textline.
-     #  Default format?
-     if ( $format eq '' ) {
+     $width = &recalcto_mm($width); # Get width in mm.
+     my $chars_per_line = int($width/1.6);   # Character/textline.
-         # For the default format, we may need to truncate
+     #  Default format?
-         # elements..  To do this we need to get the page width.
-         # we assume that each character is about 2mm in width.
-         # (correct for the header text size??).  We ignore
-         # any formatting (e.g. boldfacing in this).
-         #
-         # - Allow the student/course to be one line.
-         #   but only truncate the course.
-         # - Allow the assignment to be 2 lines (wrapped).
-         #
-         my $name_length = int( $chars_per_line * 3 / 4 );
+     if ($format eq '') {
-         my $sec_length  = int( $chars_per_line / 5 );
+ 	# For the default format, we may need to truncate
+ 	# elements..  To do this we need to get the page width.
+ 	# we assume that each character is about 2mm in width.
+ 	# (correct for the header text size??).  We ignore
+ 	# any formatting (e.g. boldfacing in this).
+ 	#
+ 	# - Allow the student/course to be one line.
+ 	#   but only truncate the course.
+ 	# - Allow the assignment to be 2 lines (wrapped).
+ 	#
-         $format = "%$name_length" . 'n';
+ 	my $name_length    = int($chars_per_line *3 /4);
+ 	my $sec_length     = int($chars_per_line / 5);
-         if ($section) {
+ 	$format  = "%$name_length".'n';
-             $format .= ' - Sec: ' . "%$sec_length" . 's';
-         }
-         $format .= '\\\\%c \\\\ %a';
+ 	if ($section) {
+ 	    $format .=  ' - Sec: '."%$sec_length".'s';
+ 	}
-     }
+ 	$format .= '\\\\%c \\\\ %a';
+     }
      # An open question is how to handle long user formatted page headers...
      # A possible future is to support e.g. %na so that the user can control
      # the truncation of the elements that can appear in the header.
      #
-     $format = &printf_style_subst( "a", $format, $assignment );
+     $format =  &printf_style_subst("a", $format, $assignment);
-     $format = &printf_style_subst( "c", $format, $course );
+     $format =  &printf_style_subst("c", $format, $course);
-     $format = &printf_style_subst( "n", $format, $student );
+     $format =  &printf_style_subst("n", $format, $student);
-     $format = &printf_style_subst( "s", $format, $section );
+     $format =  &printf_style_subst("s", $format, $section);
      # If the user put %'s in the format string, they  must be escaped
      # to \% else LaTeX will think they are comments and terminate
      # the line.. which is bad!!!
      # If the user has role author, $course and $assignment are empty so
      # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
-     if ( $format =~ /\\\\\s\\\\\s/ ) {
+     if($format =~ /\\\\\s\\\\\s/) {
          #TODO find sensible caption for page header
-         my $testPrintout =
+         my $testPrintout = '\\\\'.&mt('Authoring Space').' \\\\'.&mt('Test-Printout ');
-           '\\\\' . &mt('Construction Space') . ' \\\\' . &mt('Test-Printout ');
          $format =~ s/\\\\\s\\\\\s/$testPrintout/;
      }
      #
      #  We're going to trust LaTeX to break lines appropriately, but
      #  we'll truncate anything that's more than 3 lines worth of
- Line 565  sub format_page_header {
+ Line 1120  sub format_page_header {
      # header or rather that those control sequences won't get broken
      # by the stuff below.
      #
-     my $total_length = 3 * $chars_per_line;
+     my $total_length = 3*$chars_per_line;
-     if ( length($format) > $total_length ) {
+     if (length($format) > $total_length) {
-         $format = substr( $format, 0, $total_length );
+ 	$format = substr($format, 0, $total_length);
      }
-     return $format;
+     return $format;
  }
  #
- Line 579  sub format_page_header {
+ Line 1135  sub format_page_header {
  #
  sub num_to_letters {
      my ($num) = @_;
-     my @nums = split( '', $num );
+     my @nums= split('',$num);
-     my @num_to_let = ( 'A' .. 'Z' );
+     my @num_to_let=('A'..'Z');
      my $word;
-     foreach my $digit (@nums) { $word .= $num_to_let[$digit]; }
+     foreach my $digit (@nums) { $word.=$num_to_let[$digit]; }
      return $word;
  }
  #   Convert a letter code to numeric.
  #
  sub letters_to_num {
      my ($letters) = @_;
-     my @letters = split( '', uc($letters) );
+     my @letters = split('', uc($letters));
-     my %substitution;
+    my %substitution;
      my $digit = 0;
-     foreach my $letter ( 'A' .. 'J' ) {
+     foreach my $letter ('A'..'J') {
-         $substitution{$letter} = $digit;
+ 	$substitution{$letter} = $digit;
-         $digit++;
+ 	$digit++;
      }
      #  The substitution is done as below to preserve leading
      #  zeroes which are needed to keep the code size exact
      #
-     my $result = "";
+     my $result ="";
      foreach my $letter (@letters) {
-         $result .= $substitution{$letter};
+ 	$result.=$substitution{$letter};
      }
      return $result;
  }
- Line 617  sub letters_to_num {
+ Line 1171  sub letters_to_num {
  #     num_digits - Number of digits required.
  #
  sub is_valid_numeric_code {
-     my ( $value, $num_digits ) = @_;
+     my ($value, $num_digits) = @_;
      #   Remove leading/trailing whitespace;
      $value =~ s/^\s*//g;
      $value =~ s/\s*$//g;
      #  All digits?
-     if ( $value !~ /^[0-9]+$/ ) {
+     if ($value !~ /^[0-9]+$/) {
-         return
+ 	return "Numeric code $value has invalid characters - must only be digits";
-           "Numeric code $value has invalid characters - must only be digits";
+     }
-     }
+     if (length($value) != $num_digits) {
-     if ( length($value) != $num_digits ) {
+ 	return "Numeric code $value incorrect number of digits (correct = $num_digits)";
-         return
- "Numeric code $value incorrect number of digits (correct = $num_digits)";
      }
      return undef;
  }
  #   Determines if a code is a valid alhpa code.  Alpha codes
  #   are ciphers that map  [A-J,a-j] -> 0..9 0..9.
  #   They also have a correct digit count.
- Line 645  sub is_valid_numeric_code {
+ Line 1195  sub is_valid_numeric_code {
  #    leading and trailing whitespace are ignored.
  #
  sub is_valid_alpha_code {
-     my ( $value, $num_letters ) = @_;
+     my ($value, $num_letters) = @_;
-     # strip leading and trailing spaces.
+      # strip leading and trailing spaces.
      $value =~ s/^\s*//g;
      $value =~ s/\s*$//g;
      #  All alphas in the right range?
-     if ( $value !~ /^[A-J,a-j]+$/ ) {
+     if ($value !~ /^[A-J,a-j]+$/) {
-         return "Invalid letter code $value must only contain A-J";
+ 	return "Invalid letter code $value must only contain A-J";
      }
-     if ( length($value) != $num_letters ) {
+     if (length($value) != $num_letters) {
-         return
+ 	return "Letter code $value has incorrect number of letters (correct = $num_letters)";
- "Letter code $value has incorrect number of letters (correct = $num_letters)";
      }
      return undef;
  }
  #   Determine if a code entered by the user in a helper is valid.
  #   valid depends on the code type and the type of code selected.
  #   The type of code selected can either be numeric or
  #   Alphabetic.  If alphabetic, the code, in fact is a simple
  #   substitution cipher for the actual numeric code: 0->A, 1->B ...
  #   We'll be nice and be case insensitive for alpha codes.
- Line 678  sub is_valid_alpha_code {
+ Line 1227  sub is_valid_alpha_code {
  #    other         - An error message indicating what's wrong.
  #
  sub is_code_valid {
-     my ( $code_value, $code_option ) = @_;
+     my ($code_value, $code_option) = @_;
-     my ( $code_type, $code_length ) = ( 'letter', 6 );    # defaults.
+     my ($code_type, $code_length) = ('letter', 6);	# defaults.
      my @lines = &Apache::grades::get_scantronformat_file();
      foreach my $line (@lines) {
-         my ( $name, $type, $length ) = ( split( /:/, $line ) )[ 0, 2, 4 ];
+ 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
-         if ( $name eq $code_option ) {
+ 	if($name eq $code_option) {
-             $code_length = $length;
+ 	    $code_length = $length;
-             if ( $type eq 'number' ) {
+ 	    if($type eq 'number') {
-                 $code_type = 'number';
+ 		$code_type = 'number';
-             }
+ 	    }
-         }
+ 	}
      }
      my $valid;
-     if ( $code_type eq 'number' ) {
+     if ($code_type eq 'number') {
-         return &is_valid_numeric_code( $code_value, $code_length );
+ 	return &is_valid_numeric_code($code_value, $code_length);
-     }
+     } else {
-     else {
+ 	return &is_valid_alpha_code($code_value, $code_length);
-         return &is_valid_alpha_code( $code_value, $code_length );
      }
  }
+ #
+ # 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 716  sub is_code_valid {
+ Line 1280  sub is_code_valid {
  #
  #
  sub compare_names {
      #  First split the names up into the primary fields.
-     my ( $u1, $d1, $s1, $n1, $stat1 ) = split( /:/, $a );
+     my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
-     my ( $u2, $d2, $s2, $n2, $stat2 ) = split( /:/, $b );
+     my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
      # Now split the last name and first name of each n:
      #
-     my ( $l1, $f1 ) = split( /,/, $n1 );
+     my ($l1,$f1) = split(/,/, $n1);
-     my ( $l2, $f2 ) = split( /,/, $n2 );
+     my ($l2,$f2) = split(/,/, $n2);
      # We don't bother to remove the leading/trailing whitespace from the
      # firstname, unless the last names compare identical.
-     if ( $l1 lt $l2 ) {
+     if($l1 lt $l2) {
-         return -1;
+ 	return -1;
      }
-     if ( $l1 gt $l2 ) {
+     if($l1 gt $l2) {
-         return 1;
+ 	return  1;
      }
      # Break the tie on the first name, but there are leading (possibly trailing
      # whitespaces to get rid of first
      #
-     $f1 =~ s/^\s+//;    # Remove leading...
+     $f1 =~ s/^\s+//;		# Remove leading...
-     $f1 =~ s/\s+$//;    # Trailing spaces from first 1...
+     $f1 =~ s/\s+$//;		# Trailing spaces from first 1...
      $f2 =~ s/^\s+//;
-     $f2 =~ s/\s+$//;    # And the same for first 2...
+     $f2 =~ s/\s+$//;		# And the same for first 2...
-     if ( $f1 lt $f2 ) {
+     if($f1 lt $f2) {
-         return -1;
+ 	return -1;
      }
-     if ( $f1 gt $f2 ) {
+     if($f1 gt $f2) {
-         return 1;
+ 	return 1;
      }
      #  Must be the same name.
      return 0;
- Line 765  sub latex_header_footer_remove {
+ Line 1328  sub latex_header_footer_remove {
      $text =~ s/\\documentclass([^&]*)\\begin{document}//;
      return $text;
  }
  #
  #  If necessary, encapsulate text inside
  #  a minipage env.
  #  necessity is determined by the problem_split param.
  #
  sub encapsulate_minipage {
      my ($text) = @_;
-     if ( !( $env{'form.problem.split'} =~ /yes/i ) ) {
+     if (!($env{'form.problem.split'} =~ /yes/i)) {
-         $text = '\begin{minipage}{\textwidth}' . $text . '\end{minipage}';
+ 	$text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
      }
      return $text;
  }
  #
  #  The NUMBER_TO_PRINT and SPLIT_PDFS
  #  variables interact, this sub looks at these two parameters
- Line 792  sub adjust_number_to_print {
+ Line 1353  sub adjust_number_to_print {
      my $helper = shift;
      my $split_pdf = $helper->{'VARS'}->{'SPLIT_PDFS'};
-     if ( $split_pdf eq 'all' ) {
+     if ($split_pdf eq 'all') {
-         $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'all';
+ 	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'all';
-     }
+     } elsif ($split_pdf eq 'oneper') {
-     elsif ( $split_pdf eq 'oneper' ) {
+ 	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 1;
-         $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 1;
+     } elsif ($split_pdf eq 'sections') {
-     }
+ 	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'section';
-     elsif ( $split_pdf eq 'sections' ) {
+     } elsif ($split_pdf eq 'usenumber') {
-         $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'section';
+ 	#  Unmodified.
-     }
+     } else {
-     elsif ( $split_pdf eq 'usenumber' ) {
+ 	# Error!!!!
-         #  Unmodified.
+ 	croak "bad SPLIT_PDFS: $split_pdf in lonprintout::adjust_number_to_print";
-     }
-     else {
-         # Error!!!!
-         croak
-           "bad SPLIT_PDFS: $split_pdf in lonprintout::adjust_number_to_print";
      }
  }
  sub character_chart {
      my $result = shift;
-     return &Apache::entities::replace_entities($result);
+     return  &Apache::entities::replace_entities($result);
  }
  sub old_character_chart {
      my $result = shift;
      $result =~ s/&\#0?0?(7|9);//g;
      $result =~ s/&\#0?(10|13);//g;
      $result =~ s/&\#0?32;/ /g;
- Line 830  sub old_character_chart {
+ Line 1385  sub old_character_chart {
      $result =~ s/&(\#0?34|quot);/\"/g;
      $result =~ s/&\#0?35;/\\\#/g;
      $result =~ s/&\#0?36;/\\\$/g;
      $result =~ s/&\#0?37;/\\%/g;
      $result =~ s/&(\#0?38|amp);/\\&/g;
      $result =~ s/&\#(0?39|146);/\'/g;
      $result =~ s/&\#0?40;/(/g;
      $result =~ s/&\#0?41;/)/g;
- Line 938  sub old_character_chart {
+ Line 1493  sub old_character_chart {
      $result =~ s/&(\#160|nbsp);/~/g;
      $result =~ s/&(\#161|iexcl);/!\`/g;
      $result =~ s/&(\#162|cent);/\\textcent /g;
      $result =~ s/&(\#163|pound);/\\pounds /g;
      $result =~ s/&(\#164|curren);/\\textcurrency /g;
      $result =~ s/&(\#165|yen);/\\textyen /g;
      $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
- Line 964  sub old_character_chart {
+ Line 1519  sub old_character_chart {
      $result =~ s/&(\#188|frac14);/\\textonequarter /g;
      $result =~ s/&(\#189|frac12);/\\textonehalf /g;
      $result =~ s/&(\#190|frac34);/\\textthreequarters /g;
      $result =~ s/&(\#191|iquest);/?\`/g;
      $result =~ s/&(\#192|Agrave);/\\\`{A}/g;
      $result =~ s/&(\#193|Aacute);/\\\'{A}/g;
      $result =~ s/&(\#194|Acirc);/\\^{A}/g;
      $result =~ s/&(\#195|Atilde);/\\~{A}/g;
      $result =~ s/&(\#196|Auml);/\\\"{A}/g;
      $result =~ s/&(\#197|Aring);/{\\AA}/g;
      $result =~ s/&(\#198|AElig);/{\\AE}/g;
      $result =~ s/&(\#199|Ccedil);/\\c{c}/g;
      $result =~ s/&(\#200|Egrave);/\\\`{E}/g;
      $result =~ s/&(\#201|Eacute);/\\\'{E}/g;
      $result =~ s/&(\#202|Ecirc);/\\^{E}/g;
      $result =~ s/&(\#203|Euml);/\\\"{E}/g;
      $result =~ s/&(\#204|Igrave);/\\\`{I}/g;
      $result =~ s/&(\#205|Iacute);/\\\'{I}/g;
      $result =~ s/&(\#206|Icirc);/\\^{I}/g;
      $result =~ s/&(\#207|Iuml);/\\\"{I}/g;
      $result =~ s/&(\#209|Ntilde);/\\~{N}/g;
      $result =~ s/&(\#210|Ograve);/\\\`{O}/g;
      $result =~ s/&(\#211|Oacute);/\\\'{O}/g;
      $result =~ s/&(\#212|Ocirc);/\\^{O}/g;
      $result =~ s/&(\#213|Otilde);/\\~{O}/g;
      $result =~ s/&(\#214|Ouml);/\\\"{O}/g;
      $result =~ s/&(\#215|times);/\\ensuremath\{\\times\}/g;
      $result =~ s/&(\#216|Oslash);/{\\O}/g;
      $result =~ s/&(\#217|Ugrave);/\\\`{U}/g;
      $result =~ s/&(\#218|Uacute);/\\\'{U}/g;
      $result =~ s/&(\#219|Ucirc);/\\^{U}/g;
      $result =~ s/&(\#220|Uuml);/\\\"{U}/g;
- Line 1020  sub old_character_chart {
+ Line 1575  sub old_character_chart {
      $result =~ s/&(\#246|ouml);/\\\"{o}/g;
      $result =~ s/&(\#247|divide);/\\ensuremath\{\\div\}/g;
      $result =~ s/&(\#248|oslash);/{\\o}/g;
      $result =~ s/&(\#249|ugrave);/\\\`{u}/g;
      $result =~ s/&(\#250|uacute);/\\\'{u}/g;
      $result =~ s/&(\#251|ucirc);/\\^{u}/g;
      $result =~ s/&(\#252|uuml);/\\\"{u}/g;
- Line 1028  sub old_character_chart {
+ Line 1583  sub old_character_chart {
      $result =~ s/&(\#255|yuml);/\\\"{y}/g;
      $result =~ s/&\#295;/\\ensuremath\{\\hbar\}/g;
      $result =~ s/&\#952;/\\ensuremath\{\\theta\}/g;
+ #Greek Alphabet
-     #Greek Alphabet
      $result =~ s/&(alpha|\#945);/\\ensuremath\{\\alpha\}/g;
      $result =~ s/&(beta|\#946);/\\ensuremath\{\\beta\}/g;
      $result =~ s/&(gamma|\#947);/\\ensuremath\{\\gamma\}/g;
- Line 1080  sub old_character_chart {
+ Line 1634  sub old_character_chart {
      $result =~ s/&(Chi|\#935);/X/g;
      $result =~ s/&(Psi|\#936);/\\ensuremath\{\\Psi\}/g;
      $result =~ s/&(Omega|\#937);/\\ensuremath\{\\Omega\}/g;
+ #Arrows (extended HTML 4.01)
-     #Arrows (extended HTML 4.01)
      $result =~ s/&(larr|\#8592);/\\ensuremath\{\\leftarrow\}/g;
      $result =~ s/&(uarr|\#8593);/\\ensuremath\{\\uparrow\}/g;
      $result =~ s/&(rarr|\#8594);/\\ensuremath\{\\rightarrow\}/g;
- Line 1092  sub old_character_chart {
+ Line 1645  sub old_character_chart {
      $result =~ s/&(rArr|\#8658);/\\ensuremath\{\\Rightarrow\}/g;
      $result =~ s/&(dArr|\#8659);/\\ensuremath\{\\Downarrow\}/g;
      $result =~ s/&(hArr|\#8660);/\\ensuremath\{\\Leftrightarrow\}/g;
+ #Mathematical Operators (extended HTML 4.01)
-     #Mathematical Operators (extended HTML 4.01)
      $result =~ s/&(forall|\#8704);/\\ensuremath\{\\forall\}/g;
      $result =~ s/&(part|\#8706);/\\ensuremath\{\\partial\}/g;
      $result =~ s/&(exist|\#8707);/\\ensuremath\{\\exists\}/g;
- Line 1132  sub old_character_chart {
+ Line 1684  sub old_character_chart {
      $result =~ s/&(otimes|\#8855);/\\ensuremath\{\\otimes\}/g;
      $result =~ s/&(perp|\#8869);/\\ensuremath\{\\perp\}/g;
      $result =~ s/&(sdot|\#8901);/\\ensuremath\{\\cdot\}/g;
+ #Geometric Shapes (extended HTML 4.01)
-     #Geometric Shapes (extended HTML 4.01)
      $result =~ s/&(loz|\#9674);/\\ensuremath\{\\Diamond\}/g;
+ #Miscellaneous Symbols (extended HTML 4.01)
-     #Miscellaneous Symbols (extended HTML 4.01)
      $result =~ s/&(spades|\#9824);/\\ensuremath\{\\spadesuit\}/g;
      $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
      $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
      $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
+ #   Chemically useful 'things' contributed by Hon Kie (bug 4652).
-     #   Chemically useful 'things' contributed by Hon Kie (bug 4652).
      $result =~ s/&\#8636;/\\ensuremath\{\\leftharpoonup\}/g;
      $result =~ s/&\#8637;/\\ensuremath\{\\leftharpoondown\}/g;
- Line 1163  sub old_character_chart {
+ Line 1712  sub old_character_chart {
      $result =~ s/&(ldquo|#8220);/\`\`/g;
      $result =~ s/&(rdquo|#8221);/\'\'/g;
      return $result;
  }
- #width, height, oddsidemargin, evensidemargin, topmargin
- my %page_formats = (
-     'letter' => {
-         'book' => {
-             '1' => [ '7.1 in',  '9.8 in', '-0.57 in', '-0.57 in', '0.275 in' ],
-             '2' => [ '3.66 in', '9.8 in', '-0.57 in', '-0.57 in', '0.275 in' ]
-         },
-         'album' => {
-             '1' => [ '8.8 in', '6.8 in', '-0.55 in', '-0.55 in', '0.394 in' ],
-             '2' => [ '4.8 in', '6.8 in', '-0.5 in',  '-1.0 in',  '3.5 in' ]
-         },
-     },
-     'legal' => {
-         'book' => {
-             '1' => [ '7.1 in',  '13 in',, '-0.57 in', '-0.57 in', '-0.5 in' ],
-             '2' => [ '3.66 in', '13 in',  '-0.57 in', '-0.57 in', '-0.5 in' ]
-         },
-         'album' => {
-             '1' => [ '12 in',  '7.1 in',, '-0.57 in', '-0.57 in', '-0.5 in' ],
-             '2' => [ '6.0 in', '7.1 in',  '-1 in',    '-1 in',    '5 in' ]
-         },
-     },
-     'tabloid' => {
-         'book' => {
-             '1' => [ '9.8 in', '16 in', '-0.57 in', '-0.57 in', '-0.5 in' ],
-             '2' => [ '4.9 in', '16 in', '-0.57 in', '-0.57 in', '-0.5 in' ]
-         },
-         'album' => {
-             '1' => [ '16 in', '9.8 in', '-0.57 in', '-0.57 in', '-0.5 in' ],
-             '2' => [ '16 in', '4.9 in', '-0.57 in', '-0.57 in', '-0.5 in' ]
-         },
-     },
-     'executive' => {
-         'book' => {
-             '1' => [ '6.8 in', '9 in', '-0.57 in', '-0.57 in', '1.2 in' ],
-             '2' => [ '3.1 in', '9 in', '-0.57 in', '-0.57 in', '1.2 in' ]
-         },
-         'album' => {
-             '1' => [],
-             '2' => []
-         },
-     },
-     'a2' => {
-         'book' => {
-             '1' => [],
-             '2' => []
-         },
-         'album' => {
-             '1' => [],
-             '2' => []
-         },
-     },
-     'a3' => {
-         'book' => {
-             '1' => [],
-             '2' => []
-         },
-         'album' => {
-             '1' => [],
-             '2' => []
-         },
-     },
-     'a4' => {
-         'book' => {
-             '1' =>
-               [ '17.6 cm', '27.2 cm', '-1.397 cm', '-2.11 cm', '-1.27 cm' ],
-             '2' => [ '9.1 cm', '27.2 cm', '-1.397 cm', '-2.11 cm', '-1.27 cm' ]
-         },
-         'album' => {
-             '1' => [ '21.59 cm', '19.558 cm', '-1.397cm',  '-2.11 cm', '0 cm' ],
-             '2' => [ '9.91 cm',  '19.558 cm', '-1.397 cm', '-2.11 cm', '0 cm' ]
-         },
-     },
-     'a5' => {
-         'book' => {
-             '1' => [],
-             '2' => []
-         },
-         'album' => {
-             '1' => [],
-             '2' => []
-         },
-     },
-     'a6' => {
-         'book' => {
-             '1' => [],
-             '2' => []
-         },
-         'album' => {
-             '1' => [],
-             '2' => []
-         },
-     },
- );
- sub page_format {
+                   #width, height, oddsidemargin, evensidemargin, topmargin
+ my %page_formats=
+     ('letter' => {
+ 	 'book' => {
+ 	     '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
+ 	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','0.394 in'],
+ 	     '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
+ 	 },
+      },
+      'legal' => {
+ 	 'book' => {
+ 	     '1' => ['7.1 in','13 in',,'-0.57 in','-0.57 in','-0.5 in'],
+ 	     '2' => ['3.66 in','13 in','-0.57 in','-0.57 in','-0.5 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
+              '2' => ['6.0 in','7.1 in','-1 in','-1 in','5 in']
+           },
+      },
+      'tabloid' => {
+ 	 'book' => {
+ 	     '1' => ['9.8 in','16 in','-0.57 in','-0.57 in','-0.5 in'],
+ 	     '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => ['16 in','9.8 in','-0.57 in','-0.57 in','-0.5 in'],
+ 	     '2' => ['16 in','4.9 in','-0.57 in','-0.57 in','-0.5 in']
+           },
+      },
+      'executive' => {
+ 	 'book' => {
+ 	     '1' => ['6.8 in','9 in','-0.57 in','-0.57 in','1.2 in'],
+ 	     '2' => ['3.1 in','9 in','-0.57 in','-0.57 in','1.2 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a2' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a3' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a4' => {
+ 	 'book' => {
+ 	     '1' => ['17.6 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm'],
+ 	     '2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']
+ 	 },
+ 	 'album' => {
+ 	     '1' => ['21.59 cm','19.558 cm','-1.397cm','-2.11 cm','0 cm'],
+ 	     '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
+ 	 },
+      },
+      'a5' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a6' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      );
+ sub page_format {
  #
  #Supported paper format: "Letter [8 1/2x11 in]",      "Legal [8 1/2x14 in]",
  #                        "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
  #                        "A2 [420x594 mm]",           "A3 [297x420 mm]",
  #                        "A4 [210x297 mm]",           "A5 [148x210 mm]",
  #                        "A6 [105x148 mm]"
  #
-     my ( $papersize, $layout, $numberofcolumns ) = @_;
+     my ($papersize,$layout,$numberofcolumns) = @_;
-     return @{ $page_formats{$papersize}->{$layout}->{$numberofcolumns} };
+     return @{$page_formats{$papersize}->{$layout}->{$numberofcolumns}};
  }
  sub get_name {
-     my ( $uname, $udom ) = @_;
+     my ($uname,$udom)=@_;
-     if ( !defined($uname) ) { $uname = $env{'user.name'}; }
+     if (!defined($uname)) { $uname=$env{'user.name'}; }
-     if ( !defined($udom) )  { $udom  = $env{'user.domain'}; }
+     if (!defined($udom)) { $udom=$env{'user.domain'}; }
-     my $plainname = &Apache::loncommon::plainname( $uname, $udom );
+     my $plainname=&Apache::loncommon::plainname($uname,$udom);
-     if ( $plainname =~ /^\s*$/ ) { $plainname = $uname . '@' . $udom; }
+     if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
-     $plainname = &Apache::lonxml::latex_special_symbols( $plainname, 'header' );
+    $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
      return $plainname;
  }
  sub get_course {
      my $courseidinfo;
-     if ( defined( $env{'request.course.id'} ) ) {
+     if (defined($env{'request.course.id'})) {
-         $courseidinfo = &Apache::lonxml::latex_special_symbols(
+ 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
-             &unescape(
+ 	my $sec = $env{'request.course.sec'};
-                 $env{ 'course.' . $env{'request.course.id'} . '.description' }
-             ),
-             'header'
-         );
-         my $sec = $env{'request.course.sec'};
      }
      return $courseidinfo;
  }
  sub page_format_transformation {
-     my (
+     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist,$selectionmade) = @_;
-         $papersize,       $layout,    $numberofcolumns,
+     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
-         $choice,          $text,      $assignment,
-         $tableofcontents, $indexlist, $selectionmade
+     if ($selectionmade eq '4') {
-     ) = @_;
+ 	if ($choice eq 'all_problems') {
-     my ( $textwidth, $textheight, $oddoffset, $evenoffset, $topmargin );
+             $assignment=&mt('Problems from the Whole Course');
+ 	} else {
-     if ( $selectionmade eq '4' ) {
+             $assignment=&mt('Resources from the Whole Course');
-         if ( $choice eq 'all_problems' ) {
+ 	}
-             $assignment = &mt('Problems from the Whole Course');
+     } else {
-         }
+ 	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
-         else {
-             $assignment = &mt('Resources from the Whole Course');
-         }
-     }
-     else {
-         $assignment =
-           &Apache::lonxml::latex_special_symbols( $assignment, 'header' );
      }
-     ( $textwidth, $textheight, $oddoffset, $evenoffset, $topmargin ) =
+     ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
-       &page_format( $papersize, $layout, $numberofcolumns, $topmargin );
-     my $name         = &get_name();
+     my $name = &get_name();
      my $courseidinfo = &get_course();
      my $header_text  = $parmhash{'print_header_format'};
-     $header_text =
+     $header_text     = &format_page_header($textwidth, $header_text, $assignment,
-       &format_page_header( $textwidth, $header_text, $assignment, $courseidinfo,
+ 					   $courseidinfo, $name);
-         $name );
      my $topmargintoinsert = '';
-     if ( $topmargin ne '0' ) {
+     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
-         $topmargintoinsert = '\setlength{\topmargin}{' . $topmargin . '}';
+     my $fancypagestatement='';
-     }
+     if ($numberofcolumns eq '2') {
-     my $fancypagestatement = '';
+ 	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
-     if ( $numberofcolumns eq '2' ) {
+     } else {
-         $fancypagestatement = "\\fancyhead{}\\fancyhead[LO]{$header_text}";
+ 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
      }
-     else {
+     if ($layout eq 'album') {
-         $fancypagestatement = "\\rhead{}\\chead{}\\lhead{$header_text}";
+ 	    $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 ( $layout eq 'album' ) {
+ 	if ($choice ne 'All class print') {
-         $text =~
+ 	    $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/;
- 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 /;
+ 	} 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{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
-     elsif ( $layout eq 'book' ) {
+ 	}
-         if ( $choice ne 'All class print' ) {
+ 	if ($papersize eq 'a4') {
-             $text =~
+ 	    my $papersize_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/;
+ 	    if ($perm{'pav'}) {
-         }
+ 		$papersize_text = '\\special{papersize=210mm,297mm}';
-         else {
+ 	    } else {
-             $text =~
+ 		$papersize_text = '\special{papersize=210mm,297mm}';
- 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 /;
+ 	    }
-         }
+ 	    $text =~ s/(\\begin{document})/$1$papersize_text/;
-         if ( $papersize eq 'a4' ) {
+ 	}
-             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' ) {
+     if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
-         $text =~ s/(\\begin{document})/\\makeindex $1/;
+     if ($indexlist eq 'yes') {
-         $text =~ s/(\\end{document})/\\strut\\\\\\strut\\printindex $1/;
+ 	$text=~s/(\\begin{document})/\\makeindex $1/;
+ 	$text=~s/(\\end{document})/\\strut\\\\\\strut\\printindex $1/;
      }
      return $text;
  }
- sub page_cleanup {
-     my $result = shift;
+ sub page_cleanup {
+     my $result = shift;
      $result =~ m/\\end{document}(\d*)$/;
      my $number_of_columns = $1;
-     my $insert            = '{';
+     my $insert = '{';
-     for ( my $id = 1 ; $id <= $number_of_columns ; $id++ ) { $insert .= 'l'; }
+     for (my $id=1;$id<=$number_of_columns;$id++) { $insert .='l'; }
      $insert .= '}';
-     $result =~
+     $result =~ s/(\\begin{longtable})INSERTTHEHEADOFLONGTABLE\\endfirsthead\\endhead/$1$insert/g;
- s/(\\begin{longtable})INSERTTHEHEADOFLONGTABLE\\endfirsthead\\endhead/$1$insert/g;
      $result =~ s/&\s*REMOVETHEHEADOFLONGTABLE\\\\/\\\\/g;
-     return $result, $number_of_columns;
+     return $result,$number_of_columns;
  }
  sub details_for_menu {
-     my ($helper) = @_;
+     my ($helper)=@_;
-     my $postdata = $env{'form.postdata'};
+     my $postdata=$env{'form.postdata'};
-     if ( !$postdata ) { $postdata = $helper->{VARS}{'postdata'}; }
+     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
      my $name_of_resource = &Apache::lonnet::gettitle($postdata);
-     my $symbolic         = &Apache::lonnet::symbread($postdata);
+     my $symbolic = &Apache::lonnet::symbread($postdata);
-     return if ( $symbolic eq '' );
+     return if ( $symbolic eq '');
-     my ( $map, $id, $resource ) = &Apache::lonnet::decode_symb($symbolic);
+     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
-     $map = &Apache::lonnet::clutter($map);
+     $map=&Apache::lonnet::clutter($map);
      my $name_of_sequence = &Apache::lonnet::gettitle($map);
-     if ( $name_of_sequence =~ /^\s*$/ ) {
+     if ($name_of_sequence =~ /^\s*$/) {
-         $map =~ m|([^/]+)$|;
+ 	$map =~ m|([^/]+)$|;
-         $name_of_sequence = $1;
+ 	$name_of_sequence = $1;
      }
-     my $name_of_map = &Apache::lonnet::gettitle( $env{'request.course.uri'} );
+     my $name_of_map = &Apache::lonnet::gettitle($env{'request.course.uri'});
-     if ( $name_of_map =~ /^\s*$/ ) {
+     if ($name_of_map =~ /^\s*$/) {
-         $env{'request.course.uri'} =~ m|([^/]+)$|;
+ 	$env{'request.course.uri'} =~ m|([^/]+)$|;
-         $name_of_map = $1;
+ 	$name_of_map = $1;
      }
-     return ( $name_of_resource, $name_of_sequence, $name_of_map );
+     return ($name_of_resource,$name_of_sequence,$name_of_map);
  }
  sub copyright_line {
-     return
+     return '\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\vspace*{-2 mm}\newline\noindent{\tiny Printed from LON-CAPA\copyright MSU{\hfill} Licensed under GNU General Public License } ';
- '\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\vspace*{-2 mm}\newline\noindent{\tiny Printed from LON-CAPA\copyright MSU{\hfill} Licensed under GNU General Public License } ';
  }
- my $end_of_student = "\n" . '\special{ps:ENDOFSTUDENTSTAMP}' . "\n";
+ my $end_of_student = "\n".'\special{ps:ENDOFSTUDENTSTAMP}'."\n";
  sub latex_corrections {
-     my ( $number_of_columns, $result, $selectionmade, $answer_mode ) = @_;
+     my ($number_of_columns,$result,$selectionmade,$answer_mode) = @_;
  #    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
      my $copyright = &copyright_line();
-     if ( $selectionmade eq '1' || $answer_mode eq 'only' ) {
+     if ($selectionmade eq '1' || $answer_mode eq 'only') {
-         $result =~
+ 	$result =~ s/(\\end{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
- 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/;
-     else {
-         $result =~
- s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
      }
      $result =~ s/\$number_of_columns/$number_of_columns/g;
-     $result =~
+     $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
- 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;
+ #-- LaTeX corrections
-     #-- LaTeX corrections
+     my $first_comment = index($result,'<!--',0);
-     my $first_comment = index( $result, '<!--', 0 );
+     while ($first_comment != -1) {
-     while ( $first_comment != -1 ) {
+ 	my $end_comment = index($result,'-->',$first_comment);
-         my $end_comment = index( $result, '-->', $first_comment );
+ 	substr($result,$first_comment,$end_comment-$first_comment+3) = '';
-         substr( $result, $first_comment, $end_comment - $first_comment + 3 ) =
+ 	$first_comment = index($result,'<!--',$first_comment);
-           '';
-         $first_comment = index( $result, '<!--', $first_comment );
      }
-     $result =~ s/^\s+$//gm;    #remove empty lines
+     $result =~ s/^\s+$//gm; #remove empty lines
-                                #removes more than one empty space
+     #removes more than one empty space
      $result =~ s|(\s\s+)|($1=~/[\n\r]/)?"\n":" "|ge;
      $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
      $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
      $result =~ s/{\\par }\s*\\\\/\\\\/gm;
      $result =~ s/\\\\\s+\[/ \[/g;
      #conversion of html characters to LaTeX equivalents
-     if ( $result =~ m/&(\w+|#\d+);/ ) {
+     if ($result =~ m/&(\w+|#\d+);/) {
-         $result = &character_chart($result);
+ 	$result = &character_chart($result);
      }
      $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
      $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
      return $result;
  }
  sub index_table {
-     my $currentURL   = shift;
+     my $currentURL = shift;
-     my $insex_string = '';
+     my $insex_string='';
-     $currentURL =~ s/\.([^\/+])$/\.$1\.meta/;
+     $currentURL=~s/\.([^\/+])$/\.$1\.meta/;
-     $insex_string = &Apache::lonnet::metadata( $currentURL, 'keywords' );
+     $insex_string=&Apache::lonnet::metadata($currentURL,'keywords');
      return $insex_string;
  }
  sub IndexCreation {
-     my ( $texversion, $currentURL ) = @_;
+     my ($texversion,$currentURL)=@_;
-     my @key_words = split( /,/, &index_table($currentURL) );
+     my @key_words=split(/,/,&index_table($currentURL));
-     my $chunk     = '';
+     my $chunk='';
-     my $st        = index $texversion, '\addcontentsline{toc}{subsection}{';
+     my $st=index $texversion,'\addcontentsline{toc}{subsection}{';
-     if ( $st > 0 ) {
+     if ($st>0) {
-         for ( my $i = 0 ; $i < 3 ; $i++ ) {
+ 	for (my $i=0;$i<3;$i++) {$st=(index $texversion,'}',$st+1);}
-             $st = ( index $texversion, '}', $st + 1 );
+ 	$chunk=substr($texversion,0,$st+1);
-         }
+ 	substr($texversion,0,$st+1)=' ';
-         $chunk = substr( $texversion, 0, $st + 1 );
-         substr( $texversion, 0, $st + 1 ) = ' ';
      }
      foreach my $key_word (@key_words) {
-         if ( $key_word =~ /\S+/ ) {
+ 	if ($key_word=~/\S+/) {
-             $texversion =~ s/\b($key_word)\b/$1 \\index{$key_word} /i;
+ 	    $texversion=~s/\b($key_word)\b/$1 \\index{$key_word} /i;
-         }
+ 	}
      }
-     if ( $st > 0 ) { substr( $texversion, 0, 1 ) = $chunk; }
+     if ($st>0) {substr($texversion,0,1)=$chunk;}
      return $texversion;
  }
  sub print_latex_header {
-     my $mode = shift;
+     my $mode=shift;
      return &Apache::londefdef::latex_header($mode);
  }
  sub path_to_problem {
-     my ( $urlp, $colwidth ) = @_;
+     my ($urlp,$colwidth)=@_;
-     $urlp = &Apache::lonnet::clutter($urlp);
+     $urlp=&Apache::lonnet::clutter($urlp);
      my $newurlp = '';
-     $colwidth =~ s/\s*mm\s*$//;
+     $colwidth=~s/\s*mm\s*$//;
+ #characters average about 2 mm in width
-     #characters average about 2 mm in width
+     if (length($urlp)*2 > $colwidth) {
-     if ( length($urlp) * 2 > $colwidth ) {
+ 	my @elements = split('/',$urlp);
-         my @elements = split( '/', $urlp );
+ 	my $curlength=0;
-         my $curlength = 0;
+ 	foreach my $element (@elements) {
-         foreach my $element (@elements) {
+ 	    if ($element eq '') { next; }
-             if ( $element eq '' ) { next; }
+ 	    if ($curlength+(length($element)*2) > $colwidth) {
-             if ( $curlength + ( length($element) * 2 ) > $colwidth ) {
+ 		$newurlp .=  '|\vskip -1 mm \verb|';
-                 $newurlp .= '|\vskip -1 mm \verb|';
+ 		$curlength=length($element)*2;
-                 $curlength = length($element) * 2;
+ 	    } else {
-             }
+ 		$curlength+=length($element)*2;
-             else {
+ 	    }
-                 $curlength += length($element) * 2;
+ 	    $newurlp.='/'.$element;
-             }
+ 	}
-             $newurlp .= '/' . $element;
+     } else {
-         }
+ 	$newurlp=$urlp;
-     }
-     else {
-         $newurlp = $urlp;
      }
-     return '{\small\noindent\verb|' . $newurlp . '|\vskip 0 mm}';
+     return '{\small\noindent\verb|'.$newurlp.'|\vskip 0 mm}';
  }
  sub recalcto_mm {
-     my $textwidth = shift;
+     my $textwidth=shift;
      my $LaTeXwidth;
-     if ( $textwidth =~ /(-?\d+\.?\d*)\s*cm/ ) {
+     if ($textwidth=~/(-?\d+\.?\d*)\s*cm/) {
-         $LaTeXwidth = $1 * 10;
+ 	$LaTeXwidth = $1*10;
+     } elsif ($textwidth=~/(-?\d+\.?\d*)\s*mm/) {
+ 	$LaTeXwidth = $1;
+     } elsif ($textwidth=~/(-?\d+\.?\d*)\s*in/) {
+ 	$LaTeXwidth = $1*25.4;
      }
-     elsif ( $textwidth =~ /(-?\d+\.?\d*)\s*mm/ ) {
+     $LaTeXwidth.=' mm';
-         $LaTeXwidth = $1;
-     }
-     elsif ( $textwidth =~ /(-?\d+\.?\d*)\s*in/ ) {
-         $LaTeXwidth = $1 * 25.4;
-     }
-     $LaTeXwidth .= ' mm';
      return $LaTeXwidth;
  }
  sub get_textwidth {
-     my ( $helper, $LaTeXwidth ) = @_;
+     my ($helper,$LaTeXwidth)=@_;
-     my $textwidth = $LaTeXwidth;
+     my $textwidth=$LaTeXwidth;
-     if (   $helper->{'VARS'}->{'pagesize.width'} =~ /\d+/
+     if ($helper->{'VARS'}->{'pagesize.width'}=~/\d+/ &&
-         && $helper->{'VARS'}->{'pagesize.widthunit'} =~ /\w+/ )
+ 	$helper->{'VARS'}->{'pagesize.widthunit'}=~/\w+/) {
-     {
+ 	$textwidth=&recalcto_mm($helper->{'VARS'}->{'pagesize.width'}.' '.
-         $textwidth =
+ 				$helper->{'VARS'}->{'pagesize.widthunit'});
-           &recalcto_mm( $helper->{'VARS'}->{'pagesize.width'} . ' '
-               . $helper->{'VARS'}->{'pagesize.widthunit'} );
      }
      return $textwidth;
  }
  sub unsupported {
-     my ( $currentURL, $mode, $symb ) = @_;
+     my ($currentURL,$mode,$symb)=@_;
-     if ( $mode ne '' ) { $mode = '\\' . $mode }
+     if ($mode ne '') {$mode='\\'.$mode}
-     my $result .= &print_latex_header($mode);
+     my $result.= &print_latex_header($mode);
-     if ( $currentURL =~ m|^(/adm/wrapper/)?ext/| ) {
+     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
-         $currentURL =~ s|^(/adm/wrapper/)?ext/|http://|;
+ 	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
-         my $title = &Apache::lonnet::gettitle($symb);
+         $currentURL=~s|^http://https://|https://|;
-         $title = &Apache::lonxml::latex_special_symbols($title);
+ 	my $title=&Apache::lonnet::gettitle($symb);
-         $result .=
+ 	$title = &Apache::lonxml::latex_special_symbols($title);
-           ' \strut \\\\ ' . $title . ' \strut \\\\ ' . $currentURL . ' ';
+ 	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
+     } else {
+ 	$result.=$currentURL;
      }
-     else {
+     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
-         $result .= $currentURL;
-     }
-     $result .=
- '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
      return $result;
  }
- Line 1576  sub unsupported {
+ Line 2087  sub unsupported {
  #
  sub map_laystyle {
      my ($laystyle) = @_;
-     if ( $laystyle eq 'L' ) {
+     if ($laystyle eq 'L') {
-         $laystyle = 'album';
+ 	$laystyle='album';
-     }
+     } else {
-     else {
+ 	$laystyle='book';
-         $laystyle = 'book';
      }
      return $laystyle;
  }
  sub print_page_in_course {
-     my ( $helper, $rparmhash, $currentURL, $resources ) = @_;
+     my ($helper, $rparmhash, $currentURL, $resources) = @_;
      my %parmhash       = %$rparmhash;
      my @page_resources = @$resources;
-     my $mode           = $helper->{'VARS'}->{'LATEX_TYPE'};
+     my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
-     my $symb           = $helper->{'VARS'}->{'symb'};
+     my $symb = $helper->{'VARS'}->{'symb'};
      my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
-     my @temporary_array = split /\|/, $format_from_helper;
-     my ( $laystyle, $numberofcolumns, $papersize, $pdfFormFields ) =
+     my @temporary_array=split /\|/,$format_from_helper;
-       @temporary_array;
+     my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
      $laystyle = &map_laystyle($laystyle);
-     my ( $textwidth, $textheight, $oddoffset, $evenoffset ) =
+     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,
-       &page_format( $papersize, $laystyle, $numberofcolumns );
+ 								      $numberofcolumns);
-     my $LaTeXwidth = &recalcto_mm($textwidth);
+     my $LaTeXwidth=&recalcto_mm($textwidth);
-     if ( $mode ne '' ) { $mode = '\\' . $mode }
-     my $result = &print_latex_header($mode);
+     if ($mode ne '') {$mode='\\'.$mode}
-     if ( $currentURL =~ m|^(/adm/wrapper/)?ext/| ) {
+     my $result   =    &print_latex_header($mode);
-         $currentURL =~ s|^(/adm/wrapper/)?ext/|http://|;
+     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
-         my $title = &Apache::lonnet::gettitle($symb);
+ 	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
-         $title = &Apache::lonxml::latex_special_symbols($title);
+ 	my $title=&Apache::lonnet::gettitle($symb);
-     }
+ 	$title = &Apache::lonxml::latex_special_symbols($title);
-     else {
+     } else {
-         $result .= $currentURL;
+         my $esc_currentURL= $currentURL;
+         $esc_currentURL =~ s/_/\\_/g;
+ 	$result.=$esc_currentURL;
      }
      $result .= '\\\\';
-     if ( $helper->{'VARS'}->{'style_file'} =~ /\w/ ) {
+     if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
-         &Apache::lonnet::appenv(
+ 	&Apache::lonnet::appenv({'construct.style' =>
-             { 'construct.style' => $helper->{'VARS'}->{'style_file'} } );
+ 				$helper->{'VARS'}->{'style_file'}});
-     }
+     } elsif ($env{'construct.style'}) {
-     elsif ( $env{'construct.style'} ) {
+ 	&Apache::lonnet::delenv('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 );
-         }
-         # these resources go through the XML transformer:
-         elsif ( $resource_src =~
- /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm\xhtml|xhtm)$/
-           )
-         {
-             my $urlp = &Apache::lonnet::clutter($resource_src);
-             my %form;
-             my %moreenv;
-             &Apache::lonxml::remember_problem_counter();
-             $moreenv{'request.filename'} = $urlp;
-             if ( $helper->{'VARS'}->{'probstatus'} eq 'exam' ) {
-                 $form{'problemtype'} = 'exam';
-             }
-             $form{'grade_target'} = 'tex';
+     foreach my $resource (@page_resources) {
-             $form{'textwidth'}    = &get_textwidth( $helper, $LaTeXwidth );
+ 	my $resource_src   = $resource->src(); # Essentially the URL of the resource.
-             $form{'pdfFormFiels'} = $pdfFormFields;                           #
+ 	$result           .= $resource->title() . '\\\\';
-             $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
+ 	# Recurse if a .page:
-             #  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' ) {
+ 	if ($resource_src =~ /.page$/i) {
-                     $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 	    my $navmap         = Apache::lonnavmaps::navmap->new();
-                 }
+ 	    my @page_resources = $navmap->retrieveResources($resource_src);
-                 else {
+ 	    $result           .= &print_page_in_course($helper, $rparmhash,
-                     $texversion =
+ 						       $resource_src, \@page_resources);
-                       &print_latex_header( $helper->{'VARS'}->{'LATEX_TYPE'} );
+         } elsif ($resource->ext()) {
-                     if ( $helper->{'VARS'}->{'construction'} ne '1' ) {
+             $result .= &unsupported($currentURL,$mode,$symb);
-                         my $title =
+ 	}
-                           &Apache::lonnet::gettitle(
+ 	# these resources go through the XML transformer:
-                             $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{Prints from construction space - there is no title.}\vskip 0 mm ';
-                         my $URLpath = $urlp;
-                         $URLpath =~ s/~([^\/]+)/public_html\/$1\/$1/;
-                         $texversion .=
-                           &path_to_problem( $URLpath, $LaTeXwidth );
-                     }
-                     $texversion .= '\vskip 1 mm ' . $answer . '\end{document}';
-                 }
-             }
+ 	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {
-             # Print annotations.
+ 	    my $urlp = &Apache::lonnet::clutter($resource_src);
-             if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 	    my %form;
-                 my $annotation .= &annotate($currentURL);
+ 	    my %moreenv;
-                 $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
-             }
-             if ( $helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes' ) {
+ 	    &Apache::lonxml::remember_problem_counter();
-                 $texversion = &IndexCreation( $texversion, $currentURL );
+ 	    $moreenv{'request.filename'}=$urlp;
-             }
+ 	    if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
-             if ( $helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes' ) {
-                 $texversion =~
+ 	    $form{'grade_target'}  = 'tex';
- s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+ 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+ 	    $form{'pdfFormFields'} = $pdfFormFields; #
+ 	    $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);
+ 	    $texversion = &latex_header_footer_remove($texversion);
-             # the first remaining line is a comment from londefdef the second
+ 	    # the first remaining line is a comment from londefdef the second
-             # line  seems to be an extraneous \vskip 1mm \\\\ :
+ 	    # line  seems to be an extraneous \vskip 1mm \\\\ :
              # (imperfect removal from header_footer_remove?
-             $texversion =~ s/\\vskip 1mm \\\\\\\\//;
+ 	    $texversion =~ s/\\vskip 1mm \\\\\\\\//;
-             $result .= $texversion;
+ 	    $result .= $texversion;
-             if ( $currentURL =~ m/\.page\s*$/ ) {
+ 	    if ($currentURL=~m/\.page\s*$/) {
-                 ( $result, $numberofcolumns ) = &page_cleanup($result);
+ 		($result,$numberofcolumns) = &page_cleanup($result);
-             }
+ 	    }
-         }
+ 	}
      }
-     $result .=
+     $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
- '\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 );
+     opendir(DIR,$prtspool);
      my @files =
-       grep(
+ 	grep(/^$env{'user.name'}_$env{'user.domain'}_printout_(\d+)_.*\.(pdf|zip)$/,readdir(DIR));
-         /^$env{'user.name'}_$env{'user.domain'}_printout_(\d+)_.*\.(pdf|zip)$/,
-         readdir(DIR) );
      closedir(DIR);
      @files = sort {
-         my ($actime) = ( stat( $prtspool . '/' . $a ) )[10];
+ 	my ($actime) = (stat($prtspool.'/'.$a))[10];
-         my ($bctime) = ( stat( $prtspool . '/' . $b ) )[10];
+ 	my ($bctime) = (stat($prtspool.'/'.$b))[10];
-         return $bctime <=> $actime;
+ 	return $bctime <=> $actime;
      } (@files);
      foreach my $filename (@files) {
-         my ($ext) = ( $filename =~ m/(pdf|zip)$/ );
+ 	my ($ext) = ($filename =~ m/(pdf|zip)$/);
-         my (
+ 	my ($cdev,$cino,$cmode,$cnlink,
-             $cdev,   $cino,     $cmode, $cnlink, $cuid,
+ 	    $cuid,$cgid,$crdev,$csize,
-             $cgid,   $crdev,    $csize, $catime, $cmtime,
+ 	    $catime,$cmtime,$cctime,
-             $cctime, $cblksize, $cblocks
+ 	    $cblksize,$cblocks)=stat($prtspool.'/'.$filename);
-         ) = stat( $prtspool . '/' . $filename );
+         my $ext_text = 'pdf' ? &mt('PDF File'):&mt('Zip File');
-         my $ext_text = 'pdf' ? &mt('PDF File') : &mt('Zip File');
+ 	my $result=&Apache::loncommon::start_data_table_row()
-         my $result =
+                   .'<td>'
-             &Apache::loncommon::start_data_table_row() . '<td>'
+                   .'<a href="/prtspool/'.$filename.'">'.$ext_text.'</a>'
-           . '<a href="/prtspool/'
+                   .'</td>'
-           . $filename . '">'
+                   .'<td>'.&Apache::lonlocal::locallocaltime($cctime).'</td>'
-           . $ext_text . '</a>' . '</td>' . '<td>'
+                   .'<td align="right">'.$csize.'</td>'
-           . &Apache::lonlocal::locallocaltime($cctime) . '</td>'
+                   .&Apache::loncommon::end_data_table_row();
-           . '<td align="right">'
+ 	if ($ext eq 'pdf') { $pdf_result .= $result; }
-           . $csize . '</td>'
+ 	if ($ext eq 'zip') { $zip_result .= $result; }
-           . &Apache::loncommon::end_data_table_row();
-         if ( $ext eq 'pdf' ) { $pdf_result .= $result; }
-         if ( $ext eq 'zip' ) { $zip_result .= $result; }
      }
-     if ( $zip_result || $pdf_result ) {
+     if ($zip_result || $pdf_result) {
-         $r->print('<hr />');
+         $output ='<hr />';
      }
      if ($zip_result) {
-         $r->print( '<h3>'
+ 	$output .='<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
-               . &mt('Recently generated printout zip files')
+                   .&Apache::loncommon::start_data_table()
-               . "</h3>\n"
+                   .&Apache::loncommon::start_data_table_header_row()
-               . &Apache::loncommon::start_data_table()
+                   .'<th>'.&mt('Download').'</th>'
-               . &Apache::loncommon::start_data_table_header_row() . '<th>'
+                   .'<th>'.&mt('Creation Date').'</th>'
-               . &mt('Download') . '</th>' . '<th>'
+                   .'<th>'.&mt('File Size (Bytes)').'</th>'
-               . &mt('Creation Date') . '</th>' . '<th>'
+                   .&Apache::loncommon::end_data_table_header_row()
-               . &mt('File Size (Bytes)') . '</th>'
+                   .$zip_result
-               . &Apache::loncommon::end_data_table_header_row()
+                   .&Apache::loncommon::end_data_table();
-               . $zip_result
-               . &Apache::loncommon::end_data_table() );
      }
      if ($pdf_result) {
-         $r->print( '<h3>'
+ 	$output .='<h3>'.&mt('Recently generated printouts')."</h3>\n"
-               . &mt('Recently generated printouts')
+                   .&Apache::loncommon::start_data_table()
-               . "</h3>\n"
+                   .&Apache::loncommon::start_data_table_header_row()
-               . &Apache::loncommon::start_data_table()
+                   .'<th>'.&mt('Download').'</th>'
-               . &Apache::loncommon::start_data_table_header_row() . '<th>'
+                   .'<th>'.&mt('Creation Date').'</th>'
-               . &mt('Download') . '</th>' . '<th>'
+                   .'<th>'.&mt('File Size (Bytes)').'</th>'
-               . &mt('Creation Date') . '</th>' . '<th>'
+                   .&Apache::loncommon::end_data_table_header_row()
-               . &mt('File Size (Bytes)') . '</th>'
+                   .$pdf_result
-               . &Apache::loncommon::end_data_table_header_row()
+                   .&Apache::loncommon::end_data_table();
-               . $pdf_result
-               . &Apache::loncommon::end_data_table() );
      }
+     return $output;
  }
  #
- Line 1860  sub recently_generated {
+ Line 2349  sub recently_generated {
  #    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");
  #}
- sub get_page_breaks {
+ sub get_page_breaks  {
      my ($helper) = @_;
      my %page_breaks;
-     foreach my $break ( split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'} ) {
+     foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
-         $page_breaks{$break} = 1;
+ 	$page_breaks{$break} = 1;
      }
      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.
- Line 1881  sub get_page_breaks {
+ Line 2369  sub get_page_breaks {
  #    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.
  #
- Line 1890  sub get_page_breaks {
+ Line 2378  sub get_page_breaks {
  #   EXTRASPACE is turned into an array.
  #
  my %possible_resources;
  my %extraspace_mm;
  my @extraspace;
- my $skips_loaded = 0;
+ my $skips_loaded       = 0;
  #  Function to load the skips hash and array
  sub load_skips {
-     my ($helper) = @_;
+     my ($helper)  = @_;
      #  If this is the first time, unrap the resources and extra spaces:
-     if ( !$skips_loaded ) {
+     if (!$skips_loaded) {
-         @extraspace = ( split( /\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'} ) );
+ 	@extraspace = (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE'}));
-         my @resource_list =
+ 	my @resource_list = (split(/\|\|\|/, $helper->{'VARS'}->{'POSSIBLE_RESOURCES'}));
-           ( split( /\|\|\|/, $helper->{'VARS'}->{'POSSIBLE_RESOURCES'} ) );
+ 	my $i = 0;
-         my $i = 0;
+ 	foreach my $resource (@resource_list) {
-         foreach my $resource (@resource_list) {
+ 	    $possible_resources{$resource} = $i;
-             $possible_resources{$resource} = $i;
+ 	    $i++;
-             $i++;
+ 	}
-         }
+ 	foreach my $mm_resource (split(/\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE_UNITS'})) {
-         foreach my $mm_resource (
+ 	    $extraspace_mm{$mm_resource} = 1;
-             split( /\|\|\|/, $helper->{'VARS'}->{'EXTRASPACE_UNITS'} ) )
+ 	}
-         {
+ 	$skips_loaded = 1;
-             $extraspace_mm{$mm_resource} = 1;
-         }
-         $skips_loaded = 1;
      }
  }
  sub get_extra_vspaces {
-     my ( $helper, $resource ) = @_;
+     my ($helper, $resource) = @_;
      &load_skips($helper);
- Line 1934  sub get_extra_vspaces {
+ Line 2420  sub get_extra_vspaces {
      my $skip  = $extraspace[$index];
      my $result = '';
-     if ( $skip ne '' ) {
+     if ($skip ne '') {
-         my $units = 'in';
+ 	my $units = 'in';
-         if ( defined( $extraspace_mm{$resource} ) ) {
+ 	if (defined($extraspace_mm{$resource})) {
-             $units = 'mm';
+ 	    $units = 'mm';
-         }
+ 	}
-         $result = '\vskip ' . $skip . ' ' . $units;
+ 	$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:
- Line 1976  sub set_form_extraspace {
+ Line 2464  sub set_form_extraspace {
      my $result = '';
-     foreach my $resource ( keys(%possible_resources) ) {
+     foreach my $resource (keys(%possible_resources)) {
-         my $vskip = $extraspace[ $possible_resources{$resource} ];
+ 	my $vskip = $extraspace[$possible_resources{$resource}];
-         $result .= $resource . '=' . $vskip . '|||';
+ 	$result  .= $resource .'=' . $vskip . '|||';
      }
-     $env{'form.extraspace'}       = $result;
+     $env{'form.extraspace'}  = $result;
      $env{'form.extraspace_units'} = $helper->{'VARS'}->{'EXTRASPACE_UNITS'};
      return $result;
  }
  #  Output a sequence (recursively if neeed)
- Line 2001  sub set_form_extraspace {
+ Line 2489  sub set_form_extraspace {
  #   prefix the latex with the page headers stuff.
  #
  sub print_construction_sequence {
-     my ( $currentURL, $helper, %form, $LaTeXwidth ) = @_;
+     my ($currentURL, $helper, %form, $LaTeXwidth) = @_;
      my $result;
-     my $rndseed = time;
+     my $rndseed=time;
-     if ( $helper->{'VARS'}->{'curseed'} ) {
+     if ($helper->{'VARS'}->{'curseed'}) {
-         $rndseed = $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 @order    = @LONCAPA::map::order;
      my @resources = @LONCAPA::map::resources;
-     for ( my $member = 0 ; $member <= $#order ; $member++ ) {
-         $resources[ $order[$member] ] =~ /^([^:]*):([^:]*):/;
-         my $urlp = $2;
-         if ( $urlp =~
- /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/
-           )
-         {
-             my $texversion = '';
-             if ( $helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only' ) {
-                 $form{'problem_split'}  = $parmhash{'problem_stream_switch'};
-                 $form{'suppress_tries'} = $parmhash{'suppress_tries'};
-                 $form{'latex_type'}     = $helper->{'VARS'}->{'LATEX_TYPE'};
-                 $form{'rndseed'}        = $rndseed;
-                 $resources_printed .= $urlp . ':';
-                 $texversion =
-                   &ssi_with_retries( $urlp, $ssi_retry_count, %form );
-             }
-             if (
-                 (
-                        ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' )
-                     || ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only' )
-                 )
-                 && ( $urlp =~
-                     /\.(problem|exam|quiz|assess|survey|form|library|page)$/ )
-               )
-             {
-                 #  Don't permanently modify %$form...
-                 my %answerform = %form;
-                 $answerform{'grade_target'}       = 'answer';
-                 $answerform{'answer_output_mode'} = 'tex';
-                 $answerform{'rndseed'}            = $rndseed;
-                 $answerform{'problem_split'} =
-                   $parmhash{'problem_stream_switch'};
-                 if ( $urlp =~ /\/res\// ) {
-                     $env{'request.state'} = 'published';
-                 }
-                 $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 {
-                     # If necessary, encapsulate answer in minipage:
-                     $texversion =
-                       &print_latex_header( $helper->{'VARS'}->{'LATEX_TYPE'} );
-                     my $title =
-                       &Apache::lonnet::gettitle( $helper->{'VARS'}->{'symb'} );
-                     $title = &Apache::lonxml::latex_special_symbols($title);
-                     my $body =
-                         '\vskip 0 mm \noindent\textbf{'
-                       . $title
-                       . '}\vskip 0 mm ';
-                     $body .= &path_to_problem( $urlp, $LaTeXwidth );
-                     $body .= '\vskip 1 mm ' . $answer . '\end{document}';
-                     $body = &encapsulate_minipage($body);
-                     $texversion .= $body;
-                 }
-             }
-             $texversion = &latex_header_footer_remove($texversion);
-             if ( $helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes' ) {
-                 $texversion = &IndexCreation( $texversion, $urlp );
-             }
-             if ( $helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes' ) {
-                 $texversion =~
- s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
-             }
-             $result .= $texversion;
-         }
-         elsif ( $urlp =~ /\.(sequence|page)$/ ) {
-             # header:
+     for (my $member=0;$member<=$#order;$member++) {
+ 	$resources[$order[$member]]=~/^([^:]*):([^:]*):/;
-             $result .=
+ 	my $urlp=$2;
-                 '\strut\newline\noindent Sequence/page '
+ 	if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
-               . $urlp
+ 	    my $texversion='';
-               . '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
+ 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-             # IF sequence, recurse:
+ 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-             if ( $urlp =~ /\.sequence$/ ) {
+ 		$form{'rndseed'}=$rndseed;
-                 my $sequence_url = $urlp;
+ 		$resources_printed .=$urlp.':';
-                 my $domain = $env{'user.domain'};  # Constr. space only on local
+ 		$texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
-                 my $user   = $env{'user.name'};
+ 	    }
+ 	    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
-                 $sequence_url =~ s/^\/res\/$domain/\/home/;
+ 		($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
-                 $sequence_url =~ s/^(\/home\/$user)/$1\/public_html/;
+ 	       ($urlp=~/$LONCAPA::assess_page_re/)) {
+ 		#  Don't permanently modify %$form...
-               #		$sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ 		my %answerform = %form;
-                 $result .=
+ 		$answerform{'grade_target'}='answer';
-                   &print_construction_sequence( $sequence_url, $helper, %form,
+ 		$answerform{'answer_output_mode'}='tex';
-                     $LaTeXwidth );
+ 		$answerform{'rndseed'}=$rndseed;
-             }
+ 		$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
-         }
+ 		if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
-         elsif ( $urlp =~ /\.pdf$/i ) {
+ 		$resources_printed .= $urlp.':';
-             my $texversion;
+ 		my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
-             if ( $member != 0 ) {
+ 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-                 $texversion .= '\cleardoublepage';
+ 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
-             }
+ 		} else {
+ 		    # If necessary, encapsulate answer in minipage:
-             $texversion .= &include_pdf($urlp);
-             $texversion = &latex_header_footer_remove($texversion);
+ 		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-             if ( $member != $#order ) {
+ 		    my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
-                 $texversion .= '\\ \cleardoublepage';
+ 		    $title = &Apache::lonxml::latex_special_symbols($title);
-             }
+ 		    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ 		    $body.=&path_to_problem($urlp,$LaTeXwidth);
-             $result .= $texversion;
+ 		    $body.='\vskip 1 mm '.$answer.'\end{document}';
-         }
+ 		    $body = &encapsulate_minipage($body);
-     }
+ 		    $texversion.=$body;
-     if ( $helper->{VARS}->{'construction'} eq '1' ) {
+ 		}
-         $result =~ s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;
+ 	    }
+ 	    $texversion = &latex_header_footer_remove($texversion);
+ 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ 		$texversion=&IndexCreation($texversion,$urlp);
+ 	    }
+ 	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ 		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+ 	    }
+ 	    $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 ';
+ 	    # IF sequence, recurse:
+ 	    if ($urlp =~ /\.sequence$/) {
+ 		$result .= &print_construction_sequence($urlp,
+ 							$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\} /;}
      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 ($r,$helper,$rparmhash) = @_;
      my %parmhash = %$rparmhash;
-     $ssi_error         = 0;    # This will be set nonzero by failing ssi's.
+     $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;
+     my $js = <<ENDPART;
  <script type="text/javascript">
      var editbrowser;
      function openbrowser(formname,elementname,only,omit) {
- Line 2169  sub output_data {
+ Line 2654  sub output_data {
  </script>
  ENDPART
      # Breadcrumbs
      #FIXME: Choose better/different breadcrumbs?!? Links?
-     my $brcrum = [
+     my $brcrum = [{'href' => '',
-         {
+                    'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
-             'href' => '',
+                   {'href' => '',
-             'text' => 'Helper'
+                    'text' => 'Preparing Printout'}];
-         },    #FIXME: Different origin possible than print out helper?
-         {
+     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',
-             'href' => '',
+                                                      $js,
-             'text' => 'Preparing Printout'
+                                                      {'bread_crumbs' => $brcrum,});
-         }
+     my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
-     ];
-     my $start_page = &Apache::loncommon::start_page( 'Preparing Printout',
+     $r->print($start_page."\n<p>\n$msg\n</p>\n");
-         $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" );
      # fetch the pagebreaks and store them in the course environment
      # The page breaks will be pulled into the hash %page_breaks which is
      # indexed by symb and contains 1's for each break.
-     $env{'form.pagebreaks'} = $helper->{'VARS'}->{'FINISHPAGE'};
+     $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
      &set_form_extraspace($helper);
-     $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'};
+     $env{'form.lastprinttype'} = $print_type;
-     &Apache::loncommon::store_course_settings(
+     &Apache::loncommon::store_course_settings('print',
-         'print',
+ 					      {'pagebreaks'    => 'scalar',
-         {
+ 					       'extraspace'    => 'scalar',
-             'pagebreaks'       => 'scalar',
+ 					       'extraspace_units' => 'scalar',
-             'extraspace'       => 'scalar',
+ 					       'lastprinttype' => 'scalar'});
-             'extraspace_units' => 'scalar',
+     my %page_breaks  = &get_page_breaks($helper);
-             'lastprinttype'    => 'scalar'
-         }
-     );
-     my %page_breaks = &get_page_breaks($helper);
      my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
-     my ( $result, $selectionmade ) = ( '', '' );
+     my ($result,$selectionmade) = ('','');
-     my $number_of_columns =
+     my $number_of_columns = 1; #used only for pages to determine the width of the cell
-;    #used only for pages to determine the width of the cell
+     my @temporary_array=split /\|/,$format_from_helper;
-     my @temporary_array = split /\|/, $format_from_helper;
+     my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
-     my ( $laystyle, $numberofcolumns, $papersize, $pdfFormFields ) =
-       @temporary_array;
      $laystyle = &map_laystyle($laystyle);
-     my ( $textwidth, $textheight, $oddoffset, $evenoffset ) =
+     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
-       &page_format( $papersize, $laystyle, $numberofcolumns );
+     my $assignment =  $env{'form.assignment'};
-     my $assignment    = $env{'form.assignment'};
+     my $LaTeXwidth=&recalcto_mm($textwidth);
-     my $LaTeXwidth    = &recalcto_mm($textwidth);
+     my @print_array=();
-     my @print_array   = ();
+     my @student_names=();
-     my @student_names = ();
      #  Common settings for the %form has:
      # In some cases these settings get overriddent by specific cases, but the
      # settings are common enough to make it worthwhile factoring them out
      # here.
      #
      my %form;
-     $form{'grade_target'}  = 'tex';
+     $form{'grade_target'} = 'tex';
-     $form{'textwidth'}     = &get_textwidth( $helper, $LaTeXwidth );
+     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
      $form{'pdfFormFields'} = $pdfFormFields;
      # If form.showallfoils is set, then request all foils be shown:
      # privilege will be enforced both by not allowing the
      # check box selecting this option to be presnt unless it's ok,
      # and by lonresponse's priv. check.
      # The if is here because lonresponse.pm only cares that
      # showallfoils is defined, not what the value is.
-     if ( $helper->{'VARS'}->{'showallfoils'} eq "1" ) {
+     if ($helper->{'VARS'}->{'showallfoils'} eq "1") {
-         $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
+ 	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
      }
+     if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+ 	&Apache::lonnet::appenv({'construct.style' =>
+ 				$helper->{'VARS'}->{'style_file'}});
+     } elsif ($env{'construct.style'}) {
+ 	&Apache::lonnet::delenv('construct.style');
+     }
+     if ($print_type eq 'current_document') {
+       #-- single document - problem, page, html, xml, ...
+ 	my ($currentURL,$cleanURL);
-     if ( $helper->{'VARS'}->{'style_file'} =~ /\w/ ) {
+ 	if ($helper->{'VARS'}->{'construction'} ne '1') {
-         &Apache::lonnet::appenv(
-             { 'construct.style' => $helper->{'VARS'}->{'style_file'} } );
-     }
-     elsif ( $env{'construct.style'} ) {
-         &Apache::lonnet::delenv('construct.style');
-     }
-     if ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document' ) {
-         #-- single document - problem, page, html, xml, ...
-         my ( $currentURL, $cleanURL );
-         if ( $helper->{'VARS'}->{'construction'} ne '1' ) {
              #prints published resource
-             $currentURL = $helper->{'VARS'}->{'postdata'};
+ 	    $currentURL=$helper->{'VARS'}->{'postdata'};
-             $cleanURL   = &Apache::lonenc::check_decrypt($currentURL);
+ 	    $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
-         }
+ 	} else {
-         else {
              #prints resource from the construction space
-             $currentURL = '/' . $helper->{'VARS'}->{'filename'};
+ 	    $currentURL=$helper->{'VARS'}->{'filename'};
-             if ( $currentURL =~ /([^?]+)/ ) { $currentURL = $1; }
+ 	    $cleanURL=$currentURL;
-             $cleanURL = $currentURL;
+ 	}
-         }
+ 	$selectionmade = 1;
-         $selectionmade = 1;
-         if (   $cleanURL !~ m|^/adm/|
+ 	if ($cleanURL!~m|^/adm/|
-             && $cleanURL =~
+ 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
- /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/
+ 	    my $rndseed=time;
-           )
+ 	    my $texversion='';
-         {
+ 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
-             my $rndseed    = time;
+ 		my %moreenv;
-             my $texversion = '';
+ 		$moreenv{'request.filename'}=$cleanURL;
-             if ( $helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only' ) {
+                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
-                 my %moreenv;
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-                 $moreenv{'request.filename'} = $cleanURL;
+ 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
-                 if ( $helper->{'VARS'}->{'probstatus'} eq 'exam' ) {
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-                     $form{'problemtype'} = 'exam';
+ 		$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
-                 }
+ 		$form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
-                 $form{'problem_split'}  = $parmhash{'problem_stream_switch'};
+ 		if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
-                 $form{'suppress_tries'} = $parmhash{'suppress_tries'};
+ 		    ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
-                 $form{'latex_type'}     = $helper->{'VARS'}->{'LATEX_TYPE'};
+ 		    $form{'problem_split'}='yes';
-                 $form{'print_discussions'} =
+ 		}
-                   $helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 		if ($helper->{'VARS'}->{'curseed'}) {
-                 $form{'print_annotations'} =
+ 		    $rndseed=$helper->{'VARS'}->{'curseed'};
-                   $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ 		}
-                 if (   ( $helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes' )
+ 		$form{'rndseed'}=$rndseed;
-                     || ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) )
+ 		&Apache::lonnet::appenv(\%moreenv);
-                 {
-                     $form{'problem_split'} = 'yes';
+ 		&Apache::lonxml::clear_problem_counter();
-                 }
-                 if ( $helper->{'VARS'}->{'curseed'} ) {
+ 		$resources_printed .= $currentURL.':';
-                     $rndseed = $helper->{'VARS'}->{'curseed'};
+ 		$texversion.=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
-                 }
-                 $form{'rndseed'} = $rndseed;
+ 		#  Add annotations if required:
-                 &Apache::lonnet::appenv( \%moreenv );
+ 		&Apache::lonxml::clear_problem_counter();
-                 &Apache::lonxml::clear_problem_counter();
+ 		&Apache::lonnet::delenv('request.filename');
-                 $resources_printed .= $currentURL . ':';
+ 	    }
-                 $texversion .=
+ 	    # current document with answers.. no need to encap in minipage
-                   &ssi_with_retries( $currentURL, $ssi_retry_count, %form );
+ 	    #  since there's only one answer.
-                 #  Add annotations if required:
+ 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-                 &Apache::lonxml::clear_problem_counter();
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-                 &Apache::lonnet::delenv('request.filename');
+ 		$form{'grade_target'}='answer';
-             }
+ 		$form{'answer_output_mode'}='tex';
+ 		$form{'rndseed'}=$rndseed;
-             # current document with answers.. no need to encap in minipage
+                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {
-             #  since there's only one answer.
+ 		    $form{'problemtype'}='exam';
+ 		}
-             if (   ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' )
+ 		$resources_printed .= $currentURL.':';
-                 || ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only' ) )
+ 		my $answer=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
-             {
-                 $form{'problem_split'} = $parmhash{'problem_stream_switch'};
-                 $form{'grade_target'}  = 'answer';
+ 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-                 $form{'answer_output_mode'} = 'tex';
+ 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
-                 $form{'rndseed'}            = $rndseed;
+ 		} else {
-                 if ( $helper->{'VARS'}->{'probstatus'} eq 'exam' ) {
+ 		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-                     $form{'problemtype'} = 'exam';
+ 		    if ($helper->{'VARS'}->{'construction'} ne '1') {
-                 }
+ 			my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
-                 $resources_printed .= $currentURL . ':';
+ 			$title = &Apache::lonxml::latex_special_symbols($title);
-                 my $answer =
+ 			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
-                   &ssi_with_retries( $currentURL, $ssi_retry_count, %form );
+ 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
+ 		    } else {
-                 if ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' ) {
+ 			$texversion.='\vskip 0 mm \noindent\textbf{'.
-                     $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                         &mt("Printing from Authoring Space: No Title").'}\vskip 0 mm ';
-                 }
-                 else {
+ 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
-                     $texversion =
+ 		    }
-                       &print_latex_header( $helper->{'VARS'}->{'LATEX_TYPE'} );
+ 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
-                     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
+ 	    # Print annotations.
-                           . '}\vskip 0 mm ';
-                         $texversion .=
-                           &path_to_problem( $cleanURL, $LaTeXwidth );
+ 	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                     }
+ 		my $annotation .= &annotate($currentURL);
-                     else {
+ 		$texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
-                         $texversion .=
+ 	    }
- '\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-                         my $URLpath = $cleanURL;
-                         $URLpath =~ s/~([^\/]+)/public_html\/$1\/$1/;
+ 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
-                         $texversion .=
+ 		$texversion=&IndexCreation($texversion,$currentURL);
-                           &path_to_problem( $URLpath, $LaTeXwidth );
+ 	    }
-                     }
+ 	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
-                     $texversion .= '\vskip 1 mm ' . $answer . '\end{document}';
+ 		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
-                 }
+ 	    }
-             }
+ 	    $result .= $texversion;
+ 	    if ($currentURL=~m/\.page\s*$/) {
-             # Print annotations.
+ 		($result,$number_of_columns) = &page_cleanup($result);
+ 	    }
-             if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+         } elsif ($cleanURL!~m|^/adm/|
-                 my $annotation .= &annotate($currentURL);
+ 		 && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
-                 $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 	    $result .= &print_construction_sequence($currentURL, $helper, %form,
-             }
+ 						    $LaTeXwidth);
+ 	    $result .= '\end{document}';
-             if ( $helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes' ) {
+ 	    if (!($result =~ /\\begin\{document\}/)) {
-                 $texversion = &IndexCreation( $texversion, $currentURL );
+ 		$result = &print_latex_header() . $result;
-             }
+ 	    }
-             if ( $helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes' ) {
+ 	    # End construction space sequence.
-                 $texversion =~
+ 	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
-             }
+ 		$resources_printed .= $currentURL.':';
-             $result .= $texversion;
+ 		my $texversion = &ssi_with_retries($currentURL, $ssi_retry_count, %form);
-             if ( $currentURL =~ m/\.page\s*$/ ) {
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                 ( $result, $number_of_columns ) = &page_cleanup($result);
+ 		    my $annotation = &annotate($currentURL);
-             }
+ 		    $texversion    =~ s/(\\end{document})/$annotation$1/;
-         }
+ 		}
-         elsif ($cleanURL !~ m|^/adm/|
+ 		$result .= $texversion;
-             && $currentURL =~ /\.(sequence|page)$/
+ 	} elsif ($cleanURL =~/\.tex$/) {
-             && $helper->{'VARS'}->{'construction'} eq '1' )
+ 	    # For this sort of print of a single LaTeX file,
-         {
+ 	    # We can just print the LaTeX file as it is uninterpreted in any way:
+ 	    #
-             #printing content of sequence from the construction space
+ 	    $result = &fetch_raw_resource($currentURL);
-             $currentURL =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ 	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-             $result .=
+ 		my $annotation = &annotate($currentURL);
-               &print_construction_sequence( $currentURL, $helper, %form,
+ 		$result =~ s/(\\end{document})/$annotation$1/;
-                 $LaTeXwidth );
+ 	    }
-             $result .= '\end{document}';
-             if ( !( $result =~ /\\begin\{document\}/ ) ) {
+ 	    $do_postprocessing = 0; # Don't massage the result.
-                 $result = &print_latex_header() . $result;
-             }
+ 	} elsif ($cleanURL =~ /\.pdf$/i) {
+ 	    $result .= &include_pdf($cleanURL);
-             # End construction space sequence.
+ 	    $result .= '\end{document}';
-         }
+ 	} elsif ($cleanURL =~ /\.page$/i) { #  Print page in non construction space contexts.
-         elsif ( $cleanURL =~ /\/(smppg|syllabus|aboutme|bulletinboard)$/ ) {
-             $form{'latex_type'} = $helper->{'VARS'}->{'LATEX_TYPE'};
+ 	    # Determine the set of resources in the map of the page:
-             if ( $currentURL =~ /\/syllabus$/ ) { $currentURL =~ s/\/res//; }
-             $resources_printed .= $currentURL . ':';
+ 	    my $navmap         =  Apache::lonnavmaps::navmap->new();
-             my $texversion =
+ 	    my @page_resources =  $navmap->retrieveResources($cleanURL);
-               &ssi_with_retries( $currentURL, $ssi_retry_count, %form );
+ 	    $result           .=  &print_page_in_course($helper, $rparmhash,
-             if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 							$cleanURL, \@page_resources);
-                 my $annotation = &annotate($currentURL);
-                 $texversion =~ s/(\\end{document})/$annotation$1/;
-             }
+ 	} else {
-             $result .= $texversion;
+ 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
-         }
+ 				  $helper->{'VARS'}->{'symb'});
-         elsif ( $cleanURL =~ /\.tex$/ ) {
+ 	}
+     } elsif (($print_type eq 'map_problems')          or
-            # For this sort of print of a single LaTeX file,
+ 	     ($print_type eq 'map_problems_in_page')  or
-            # We can just print the LaTeX file as it is uninterpreted in any way:
+ 	     ($print_type eq 'map_resources_in_page') or
-            #
+              ($print_type eq 'map_problems_pages')    or
+              ($print_type eq 'all_problems')          or
-             $result = &fetch_raw_resource($currentURL);
+ 	     ($print_type eq 'all_resources')         or # BUGBUG
-             if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 	     ($print_type eq 'select_sequences')      or
-                 my $annotation = &annotate($currentURL);
+ 	     ($print_type eq 'map_incomplete_problems_seq')
-                 $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 ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page' )
-         or ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page' )
-         or ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages' )
-         or ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems' )
-         or ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources' )
-         or    # BUGBUG
-         ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences' )
-       )
-     {
          #-- produce an output string
-         if (   ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems' )
+ 	if (($print_type eq 'map_problems')                or
-             or ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page' ) )
+ 	    ($print_type eq 'map_incomplete_problems_seq') or
-         {
+ 	    ($print_type eq 'map_problems_in_page') ) {
-             $selectionmade = 2;
+ 	    $selectionmade = 2;
-         }
+ 	} elsif (($print_type eq 'map_problems_pages') or
-         elsif (( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages' )
+ 		 ($print_type eq 'map_resources_in_page'))
-             or ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page' )
+ 	{
-           )
+ 	    $selectionmade = 3;
-         {
+ 	} elsif (($print_type eq 'all_problems')
-             $selectionmade = 3;
+ 		 ) {
-         }
+ 	    $selectionmade = 4;
-         elsif ( ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems' ) ) {
+ 	} elsif ($print_type eq 'all_resources') {  #BUGBUG
-             $selectionmade = 4;
+ 	    $selectionmade = 4;
-         }
+ 	} elsif ($print_type eq 'select_sequences') {
-         elsif ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources' ) { #BUGBUG
+ 	    $selectionmade = 7;
-             $selectionmade = 4;
+ 	}
-         }
-         elsif ( $helper->{'VARS'}->{'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'};
-         $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 $flag_latex_header_remove = 'NO';
-         my $flag_page_in_sequence    = 'NO';
-         my @master_seq     = split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-         my $prevassignment = '';
-         &Apache::lonxml::clear_problem_counter();
-         my $pbreakresources = keys %page_breaks;
-         for ( my $i = 0 ; $i <= $#master_seq ; $i++ ) {
-             &Apache::lonenc::reset_enc();
-             # Note due to document structure, not allowed to put \newpage
-             # prior to the first resource
-             if ( defined $page_breaks{ $master_seq[$i] } ) {
-                 if ( $i != 0 ) {
-                     $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 ) {
+ 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-                 $helper->{VARS}->{'assignment'} = $assignment;
+ 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
-             }
+ 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-             if ( $i == 0 ) { $prevassignment = $assignment; }
+ 	$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
-             my $texversion = '';
+ 	$form{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
-             if (   $urlp !~ m|^/adm/|
+ 	if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')   ||
-                 && $urlp =~
+ 	    ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') ) {
- /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/
+ 	    $form{'problem_split'}='yes';
-               )
+ 	}
-             {
+ 	my $flag_latex_header_remove = 'NO';
-                 $resources_printed .= $urlp . ':';
+ 	my $flag_page_in_sequence = 'NO';
-                 &Apache::lonxml::remember_problem_counter();
+ 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-                 if ( $flag_latex_header_remove eq 'NO' ) {
+ 	my $prevassignment='';
-                     $texversion .=
-                       &print_latex_header( $helper->{'VARS'}->{'LATEX_TYPE'} )
+ 	&Apache::lonxml::clear_problem_counter();
-                       ;    # RF
-                     $flag_latex_header_remove = 'YES';
+ 	my $pbreakresources = keys %page_breaks;
-                 }
+ 	for (my $i=0;$i<=$#master_seq;$i++) {
-                 $texversion .=
-                   &ssi_with_retries( $urlp, $ssi_retry_count, %form );
+ 	    &Apache::lonenc::reset_enc();
-                 if ( $urlp =~ /\.page$/ ) {
-                     ( $texversion, my $number_of_columns_page ) =
-                       &page_cleanup($texversion);
+ 	    # Note due to document structure, not allowed to put \newpage
-                     if ( $number_of_columns_page > $number_of_columns ) {
+ 	    # prior to the first resource
-                         $number_of_columns = $number_of_columns_page;
+ 	    if (defined $page_breaks{$master_seq[$i]}) {
+ 		if($i != 0) {
+ 		    $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;}
+ 	    if ($i==0) {$prevassignment=$assignment;}
+ 	    my $texversion='';
+ 	    if ($urlp!~m|^/adm/|
+ 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ 		$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')))) {
+                         $flag_latex_header_remove = 'YES';
                      }
-                     $texversion =~ s/\\end{document}\d*/\\end{document}/;
+ 		}
-                     $flag_page_in_sequence = 'YES';
+ 		$texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
-                 }
+ 		if ($urlp=~/\.page$/) {
+ 		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
-                 if (   ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' )
+ 		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}
-                     || ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only' ) )
+ 		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
-                 {
+ 		    $flag_page_in_sequence = 'YES';
+ 		}
-                     #  Don't permanently pervert the %form hash
-                     my %answerform = %form;
+ 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
-                     $answerform{'grade_target'}       = 'answer';
+ 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-                     $answerform{'answer_output_mode'} = 'tex';
+ 		    #  Don't permanently pervert the %form hash
-                     $resources_printed .= $urlp . ':';
+ 		    my %answerform = %form;
+ 		    $answerform{'grade_target'}='answer';
-                     &Apache::lonxml::restore_problem_counter();
+ 		    $answerform{'answer_output_mode'}='tex';
-                     my $answer =
+ 		    $resources_printed .= $urlp.':';
-                       &ssi_with_retries( $urlp, $ssi_retry_count, %answerform );
+ 		    &Apache::lonxml::restore_problem_counter();
-                     if ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' ) {
+ 		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
-                         $texversion =~
+                     if ($urlp =~ /\.page$/) {
-                           s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                         $answer =~ s/\\end{document}(\d*)$//;
                      }
-                     else {
+ 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-                         if ( $urlp =~
+                         if ($urlp =~ /\.page$/) {
-                             /\.(problem|exam|quiz|assess|survey|form|library)$/
+                             my @probs = split(/\\keephidden{ENDOFPROBLEM}/,$texversion);
-                           )
+                             my $lastprob = pop(@probs);
-                         {
+                             $texversion = join('\keephidden{ENDOFPROBLEM}',@probs).
-                             $texversion =
+                             $answer.'\keephidden{ENDOFPROBLEM}'.$lastprob;
-                               &print_latex_header(
+                         } else {
-                                 $helper->{'VARS'}->{'LATEX_TYPE'} );
+                             $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
-                             $texversion =~ s/\\begin{document}//;
-                             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 ';
-                             $body .= &path_to_problem( $urlp, $LaTeXwidth );
-                             $body .= '\vskip 1 mm ' . $answer;
-                             $body = &encapsulate_minipage($body);
-                             $texversion .= $body;
-                         }
-                         else {
-                             $texversion = '';
                          }
-                     }
+ 		    } else {
+ 			if ($urlp=~/$LONCAPA::assess_page_re/) {
-                 }
+ 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-                 if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ #			    $texversion =~ s/\\begin{document}//; # FIXME
-                     my $annotation .= &annotate($urlp);
+ 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
-                     $texversion =~
+ 			    $title = &Apache::lonxml::latex_special_symbols($title);
-                       s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
-                 }
+ 			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
+ 			    $body   .='\vskip 1 mm '.$answer;
-                 if ( $flag_latex_header_remove ne 'NO' ) {
+ 			    $body    = &encapsulate_minipage($body);
-                     $texversion = &latex_header_footer_remove($texversion);
+ 			    $texversion .= $body;
-                 }
+ 			} else {
-                 else {
+ 			    $texversion='';
-                     $texversion =~ s/\\end{document}//;
+ 			}
-                 }
+ 		    }
-                 if ( $helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes' ) {
-                     $texversion = &IndexCreation( $texversion, $urlp );
+ 		}
-                 }
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                 if (    ( $selectionmade == 4 )
+ 		    my $annotation .= &annotate($urlp);
-                     and ( $assignment ne $prevassignment ) )
+ 		    $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
-                 {
+ 		}
-                     my $name         = &get_name();
-                     my $courseidinfo = &get_course();
+ 		if ($flag_latex_header_remove ne 'NO') {
-                     $prevassignment = $assignment;
+ 		    $texversion = &latex_header_footer_remove($texversion);
-                     my $header_text = $parmhash{'print_header_format'};
+ 		} else {
-                     $header_text = &format_page_header(
+ 		    $texversion =~ s/\\end{document}//;
-                         $textwidth,    $header_text, $assignment,
+ 		}
-                         $courseidinfo, $name
+ 		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
-                     );
+ 		    $texversion=&IndexCreation($texversion,$urlp);
+ 		}
-                     if ( $numberofcolumns eq '1' ) {
+ 		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
-                         $result .=
+ 		    my $name = &get_name();
- '\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'
+ 		    my $courseidinfo = &get_course();
-                           . $header_text
+ 		    $prevassignment=$assignment;
-                           . '}} \vskip 5 mm ';
+ 		    my $header_text = $parmhash{'print_header_format'};
-                     }
+ 		    $header_text    = &format_page_header($textwidth, $header_text,
-                     else {
+ 							  $assignment,
-                         $result .=
+ 							  $courseidinfo,
- '\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'
+ 							  $name);
-                           . $header_text
+ 		    if ($numberofcolumns eq '1') {
-                           . '}} \vskip 5 mm ';
+ 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
-                     }
+ 		    } else {
-                 }
+ 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$header_text.'}} \vskip 5 mm ';
-                 $result .= $texversion;
+ 		    }
-                 $flag_latex_header_remove = 'YES';
+ 		}
-             }
+ 		$result .= $texversion;
-             elsif ( $urlp =~ /\/(smppg|syllabus|aboutme|bulletinboard)$/ ) {
+ 		$flag_latex_header_remove = 'YES';
-                 $form{'latex_type'} = $helper->{'VARS'}->{'LATEX_TYPE'};
+ 	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
-                 if ( $urlp =~ /\/syllabus$/ ) { $urlp =~ s/\/res//; }
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-                 $resources_printed .= $urlp . ':';
+ 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
-                 my $texversion =
+ 		$resources_printed .= $urlp.':';
-                   &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' ) {
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                     my $annotation = &annotate($urlp);
+ 		    my $annotation = &annotate($urlp);
-                     $texversion =~ s/(\\end{document)/$annotation$1/;
+ 		    $texversion =~ s/(\\end{document)/$annotation$1/;
-                 }
+ 		}
-                 if ( $flag_latex_header_remove ne 'NO' ) {
+ 		if ($flag_latex_header_remove ne 'NO') {
-                     $texversion = &latex_header_footer_remove($texversion);
+ 		    $texversion = &latex_header_footer_remove($texversion);
-                 }
+ 		} else {
-                 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';
-                 $result .= $texversion;
+ 	    } elsif ($urlp=~ /\.pdf$/i) {
-                 $flag_latex_header_remove = 'YES';
+ 		if ($i > 0) {
-             }
+ 		    $result .= '\cleardoublepage';
-             elsif ( $urlp =~ /\.pdf$/i ) {
+ 		}
-                 if ( $i > 0 ) {
+                 my $texfrompdf = &include_pdf($urlp);
-                     $result .= '\cleardoublepage';
+                 if ($flag_latex_header_remove ne 'NO') {
-                 }
+                     $texfrompdf = &latex_header_footer_remove($texfrompdf);
-                 $result .= &include_pdf($urlp);
+                 }
-                 if ( $i != $#master_seq ) {
+                 $result .= $texfrompdf;
-                     if ( $numberofcolumns eq '1' ) {
+ 		if ($i != $#master_seq) {
-                         $result .= '\newpage';
+ 		    if ($numberofcolumns eq '1') {
-                     }
+ 			$result .= '\newpage';
-                     else {
+ 		    } else {
+ 			# the \\'s seem to be needed to let LaTeX know there's something
-              # 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.
-              # on the page since LaTeX seems to not like to clear an empty page.
+ 			#
-              #
+ 			$result .= '\\ \cleardoublepage';
-                         $result .= '\\ \cleardoublepage';
+ 		    }
-                     }
+ 		}
-                 }
+ 		$flag_latex_header_remove = 'YES';
-                 $flag_latex_header_remove = 'YES';
+ 	    } else {
-             }
+ 		$texversion=&unsupported($urlp,$helper->{'VARS'}->{'LATEX_TYPE'},
-             else {
+ 					 $master_seq[$i]);
-                 $texversion =
+ 		if ($flag_latex_header_remove ne 'NO') {
-                   &unsupported( $urlp, $helper->{'VARS'}->{'LATEX_TYPE'},
+ 		    $texversion = &latex_header_footer_remove($texversion);
-                     $master_seq[$i] );
+ 		} else {
-                 if ( $flag_latex_header_remove ne 'NO' ) {
+ 		    $texversion =~ s/\\end{document}//;
-                     $texversion = &latex_header_footer_remove($texversion);
+ 		}
-                 }
+ 		$result .= $texversion;
-                 else {
+ 		$flag_latex_header_remove = 'YES';
-                     $texversion =~ s/\\end{document}//;
+ 	    }
-                 }
+ 	    if (&Apache::loncommon::connection_aborted($r)) {
-                 $result .= $texversion;
+ 		last;
-                 $flag_latex_header_remove = 'YES';
+ 	    }
-             }
+ 	}
-             if ( &Apache::loncommon::connection_aborted($r) ) {
+ 	&Apache::lonxml::clear_problem_counter();
-                 last;
+ 	if ($flag_page_in_sequence eq 'YES') {
-             }
+ 	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
-         }
+ 	}
-         &Apache::lonxml::clear_problem_counter();
+ 	$result .= '\end{document}';
-         if ( $flag_page_in_sequence eq 'YES' ) {
+      } elsif (($print_type eq 'problems_for_students')           ||
-             $result =~
+ 	      ($print_type eq 'problems_for_students_from_page') ||
-               s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+ 	      ($print_type eq 'all_problems_students')           ||
-         }
+ 	      ($print_type eq 'resources_for_students')          ||
-         $result .= '\end{document}';
+ 	      ($print_type eq 'incomplete_problems_selpeople_course') ||
-     }
+ 	      ($print_type eq 'map_incomplete_problems_people_seq')){
-     elsif (
-         ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students' )
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq
+      #-- prints assignments for whole class or for selected students
-             'problems_for_students_from_page' )
+ 	 my $type;
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students' )
+ 	 if (($print_type eq 'problems_for_students')           ||
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students' )
+ 	     ($print_type eq 'problems_for_students_from_page') ||
-       )
+ 	     ($print_type eq 'all_problems_students')           ||
-     {
+ 	     ($print_type eq 'incomplete_problems_selpeople_course') ||
+ 	     ($print_type eq 'map_incomplete_problems_people_seq')) {
-         #-- prints assignments for whole class or for selected students
+ 	     $selectionmade=5;
-         my $type;
+ 	     $type='problems';
-         if (
+ 	 } elsif ($print_type eq 'resources_for_students') {
-             ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students' )
+ 	     $selectionmade=8;
-             || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq
+ 	     $type='resources';
-                 'problems_for_students_from_page' )
+ 	 }
-             || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students' )
+ 	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
-           )
+ 	 #   The normal sort order is by section then by students within the
-         {
+ 	 #   section. If the helper var student_sort is 1, then the user has elected
-             $selectionmade = 5;
+ 	 #   to override this and output the students by name.
-             $type          = 'problems';
+ 	 #    Each element of the students array is of the form:
-         }
+ 	 #       username:domain:section:last, first:status
-         elsif ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students' )
+ 	 #
-         {
+ 	 #  Note that student sort is not compatible with printing
-             $selectionmade = 8;
+ 	 #  1 section per pdf...so that setting overrides.
-             $type          = 'resources';
+ 	 #
-         }
+ 	 if (($helper->{'VARS'}->{'student_sort'}    eq 1)  &&
-         my @students = split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+ 	     ($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
+ 	     @students = sort compare_names  @students;
-      #   The normal sort order is by section then by students within the
+ 	 } else {
-      #   section. If the helper var student_sort is 1, then the user has elected
+ 	     @students = sort compare_sections @students;
-      #   to override this and output the students by name.
+ 	 }
-      #    Each element of the students array is of the form:
+ 	 &adjust_number_to_print($helper);
-      #       username:domain:section:last, first:status
-      #
+          if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
-      #  Note that student sort is not compatible with printing
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
-      #  1 section per pdf...so that setting overrides.
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
-      #
+ 	 }
-         if (   ( $helper->{'VARS'}->{'student_sort'} eq 1 )
+ 	 # If we are splitting on section boundaries, we need
-             && ( $helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections" ) )
+ 	 # to remember that in split_on_sections and
-         {
+ 	 # print all of the students in the list.
-             @students = sort compare_names @students;
+ 	 #
-         }
+ 	 my $split_on_sections = 0;
-         &adjust_number_to_print($helper);
+ 	 if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'section') {
+ 	     $split_on_sections = 1;
-         if (   $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0'
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students+1;
-             || $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' )
+ 	 }
-         {
+ 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-             $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students + 1;
-         }
+          my $map;
+          if ($helper->{VARS}->{'symb'}) {
-         # If we are splitting on section boundaries, we need
+              ($map, my $id, my $resource) =
-         # to remember that in split_on_sections and
+                  &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
-         # print all of the students in the list.
+          }
-         #
-         my $split_on_sections = 0;
+ 	 #loop over students
-         if ( $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'section' ) {
-             $split_on_sections = 1;
+  	 my $flag_latex_header_remove = 'NO';
-             $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students + 1;
+ 	 my %moreenv;
-         }
+          $moreenv{'instructor_comments'}='hide';
-         my @master_seq = split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
+ 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
-         #loop over students
+ 	 $moreenv{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
-         my $flag_latex_header_remove = 'NO';
+ 	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
-         my %moreenv;
+ 	 if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')  ||
-         $moreenv{'instructor_comments'} = 'hide';
+ 	     ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
-         $moreenv{'textwidth'} = &get_textwidth( $helper, $LaTeXwidth );
+ 	     $moreenv{'problem_split'}='yes';
-         $moreenv{'print_discussions'} =
+ 	 }
-           $helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$#students+1);
-         $moreenv{'print_annotations'} =
+ 	 my $student_counter=-1;
-           $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ 	 my $i = 0;
-         $moreenv{'problem_split'}  = $parmhash{'problem_stream_switch'};
+ 	 my $last_section = (split(/:/,$students[0]))[2];
-         $moreenv{'suppress_tries'} = $parmhash{'suppress_tries'};
+ 	 foreach my $person (@students) {
+              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
-         if (   ( $helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes' )
+ 	     if (-e $duefile) {
-             || ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) )
+ 		 my $temp_file = Apache::File->new('>>'.$duefile);
-         {
+ 		 print $temp_file "1969\n";
-             $moreenv{'problem_split'} = 'yes';
+ 	     }
-         }
+ 	     $student_counter++;
-         my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin(
+ 	     if ($split_on_sections) {
-             $r, 'Print Status',
+ 		 my $this_section = (split(/:/,$person))[2];
-             'Class Print Status',
+ 		 if ($this_section ne $last_section) {
-             $#students + 1,
+ 		     $i++;
-             'inline', '75'
+ 		     $last_section = $this_section;
-         );
+ 		 }
-         my $student_counter = -1;
+ 	     } else {
-         my $i               = 0;
+ 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
-         my $last_section    = ( split( /:/, $students[0] ) )[2];
+ 	     }
-         foreach my $person (@students) {
+ 	     my $actual_seq = master_seq_to_person_seq($map, \@master_seq,
+                                                        $person, undef, 1);
-             my $duefile =
+ 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
- "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
+ 						     $person,$type,
-             if ( -e $duefile ) {
+ 						     \%moreenv,  $actual_seq,
-                 my $temp_file = Apache::File->new( '>>' . $duefile );
+ 						     $flag_latex_header_remove,
-                 print $temp_file "1969\n";
+ 						     $LaTeXwidth);
-             }
+ 	     $resources_printed .= ":";
-             $student_counter++;
+ 	     $print_array[$i].=$output;
-             if ($split_on_sections) {
+ 	     $student_names[$i].=$person.':'.$fullname.'_END_';
-                 my $this_section = ( split( /:/, $person ) )[2];
+ #	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
-                 if ( $this_section ne $last_section ) {
+ 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
-                     $i++;
+ 	     $flag_latex_header_remove = 'YES';
-                     $last_section = $this_section;
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
-                 }
+ 	 }
-             }
+ 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-             else {
+ 	 $result .= $print_array[0].'  \end{document}';
-                 $i = int(
+      } elsif (($print_type eq 'problems_for_anon')      ||
-                     $student_counter / $helper->{'VARS'}{'NUMBER_TO_PRINT'} );
+ 	      ($print_type eq 'problems_for_anon_page') ||
-             }
+ 	      ($print_type eq 'resources_for_anon')  ) {
-             my ( $output, $fullname, $printed ) =
+ 	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
-               &print_resources( $r, $helper, $person, $type, \%moreenv,
+ 	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
-                 \@master_seq, $flag_latex_header_remove, $LaTeXwidth );
+ 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
-             $resources_printed .= ":";
+ 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
-             $print_array[$i]   .= $output;
+ 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
-             $student_names[$i] .= $person . ':' . $fullname . '_END_';
+ 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
-             &Apache::lonhtmlcommon::Increment_PrgWin( $r, \%prog_state,
+ 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
-                 &mt('last student') . ' ' . $fullname );
+ 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
-             $flag_latex_header_remove = 'YES';
+          my @lines = &Apache::grades::get_scantronformat_file();
-             if ( &Apache::loncommon::connection_aborted($r) ) { last; }
+ 	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
-         }
+ 	 foreach my $line (@lines) {
-         &Apache::lonhtmlcommon::Close_PrgWin( $r, \%prog_state );
+              chomp($line);
-         $result .= $print_array[0] . '  \end{document}';
+ 	     my ($name,$type,$length,$bubbles_per_item) =
-     }
+                  (split(/:/,$line))[0,2,4,17];
-     elsif (( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon' )
+ 	     if ($name eq $code_option) {
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page' )
+ 		 $code_length=$length;
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon' ) )
+ 		 if ($type eq 'number') { $code_type = 'number'; }
-     {
+                  chomp($bubbles_per_item);
-         my $cdom = $env{ 'course.' . $env{'request.course.id'} . '.domain' };
+                  if (($bubbles_per_item ne '') && ($bubbles_per_item > 0)) {
-         my $cnum = $env{ 'course.' . $env{'request.course.id'} . '.num' };
+                      $bubbles_per_row = $bubbles_per_item;
-         my $num_todo      = $helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
+                  }
-         my $code_name     = $helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
+ 	     }
-         my $old_name      = $helper->{'VARS'}->{'REUSE_OLD_CODES'};
+ 	 }
-         my $single_code   = $helper->{'VARS'}->{'SINGLE_CODE'};
+          my ($randomorder,$randompick,$map);
-         my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
+          if ($helper->{VARS}{'symb'}) {
+              ($map, my $id, my $resource) =
-         my $code_option = $helper->{'VARS'}->{'CODE_OPTION'};
+                  &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
-         my @lines       = &Apache::grades::get_scantronformat_file();
+              my $navmap = Apache::lonnavmaps::navmap->new();
-         my ( $code_type, $code_length ) = ( 'letter', 6 );
+              if (defined($navmap)) {
-         foreach my $line (@lines) {
+                  if ($map) {
-             my ( $name, $type, $length ) = ( split( /:/, $line ) )[ 0, 2, 4 ];
+                      my $mapres = $navmap->getResourceByUrl($map);
-             if ( $name eq $code_option ) {
+                      $randomorder = $mapres->randomorder();
-                 $code_length = $length;
+                      $randompick = $mapres->randompick();
-                 if ( $type eq 'number' ) { $code_type = 'number'; }
+                  }
-             }
+              }
-         }
+          }
-         my %moreenv = ( 'textwidth' => &get_textwidth( $helper, $LaTeXwidth ) );
+ 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
-         $moreenv{'problem_split'}       = $parmhash{'problem_stream_switch'};
+ 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
-         $moreenv{'instructor_comments'} = 'hide';
+          $moreenv{'instructor_comments'}='hide';
-         my $seed = time + ( $$ << 16 ) + ($$);
+          $moreenv{'bubbles_per_row'} = $bubbles_per_row;
-         my @allcodes;
+ 	 my $seed=time+($$<<16)+($$);
-         if ($old_name) {
+ 	 my @allcodes;
-             my %result =
+ 	 if ($old_name) {
-               &Apache::lonnet::get( 'CODEs', [ $old_name, "type\0$old_name" ],
+ 	     my %result=&Apache::lonnet::get('CODEs',
-                 $cdom, $cnum );
+ 					     [$old_name,"type\0$old_name"],
-             $code_type = $result{"type\0$old_name"};
+ 					     $cdom,$cnum);
-             @allcodes  = split( ',', $result{$old_name} );
+ 	     $code_type=$result{"type\0$old_name"};
-             $num_todo  = scalar(@allcodes);
+ 	     @allcodes=split(',',$result{$old_name});
-         }
+ 	     $num_todo=scalar(@allcodes);
-         elsif ($selected_code) {    # Selection value is always numeric.
+ 	 } elsif ($selected_code) { # Selection value is always numeric.
-             $num_todo = 1;
+ 	     $num_todo = 1;
-             @allcodes = ($selected_code);
+ 	     @allcodes = ($selected_code);
-         }
+ 	 } elsif ($single_code) {
-         elsif ($single_code) {
+ 	     $num_todo    = 1;	# Unconditionally one code to do.
-             $num_todo = 1;          # Unconditionally one code to do.
+ 	     # If an alpha code have to convert to numbers so it can be
-                  # If an alpha code have to convert to numbers so it can be
+ 	     # converted back to letters again :-)
-                  # converted back to letters again :-)
+ 	     #
-                  #
+ 	     if ($code_type ne 'number') {
-             if ( $code_type ne 'number' ) {
+ 		 $single_code = &letters_to_num($single_code);
-                 $single_code = &letters_to_num($single_code);
+ 	     }
-             }
+ 	     @allcodes = ($single_code);
-             @allcodes = ($single_code);
+ 	 } else {
-         }
+ 	     my %allcodes;
-         else {
+ 	     srand($seed);
-             my %allcodes;
+ 	     for (my $i=0;$i<$num_todo;$i++) {
-             srand($seed);
+ 		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
-             for ( my $i = 0 ; $i < $num_todo ; $i++ ) {
+ 					    $code_type);
-                 $moreenv{'CODE'} =
+ 	     }
-                   &get_CODE( \%allcodes, $i, $seed, $code_length, $code_type );
+ 	     if ($code_name) {
-             }
+ 		 &Apache::lonnet::put('CODEs',
-             if ($code_name) {
+ 				      {
-                 &Apache::lonnet::put(
+ 					$code_name =>join(',',keys(%allcodes)),
-                     'CODEs',
+ 					"type\0$code_name" => $code_type
-                     {
+ 				      },
-                         $code_name         => join( ',', keys(%allcodes) ),
+ 				      $cdom,$cnum);
-                         "type\0$code_name" => $code_type
+ 	     }
-                     },
+ 	     @allcodes=keys(%allcodes);
-                     $cdom, $cnum
+ 	 }
-                 );
+ 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-             }
+ 	 my ($type) = split(/_/,$print_type);
-             @allcodes = keys(%allcodes);
+ 	 &adjust_number_to_print($helper);
-         }
+ 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
-         my @master_seq = split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ 	 if ($number_per_page eq '0' || $number_per_page eq 'all'
-         my ($type) = split( /_/, $helper->{'VARS'}->{'PRINT_TYPE'} );
+ 	     || $number_per_page eq 'section') {
-         &adjust_number_to_print($helper);
+ 	     $number_per_page=$num_todo > 0 ? $num_todo : 1;
-         my $number_per_page = $helper->{'VARS'}->{'NUMBER_TO_PRINT'};
+ 	 }
-         if ( $number_per_page eq '0' || $number_per_page eq 'all' ) {
+ 	 my $flag_latex_header_remove = 'NO';
-             $number_per_page = $num_todo;
+ 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);
-         }
+ 	 my $count=0;
-         my $flag_latex_header_remove = 'NO';
+ 	 foreach my $code (sort(@allcodes)) {
-         my %prog_state =
+ 	     my $file_num=int($count/$number_per_page);
-           &Apache::lonhtmlcommon::Create_PrgWin( $r, 'Print Status',
+ 	     if ($code_type eq 'number') {
-             'Class Print Status',
+ 		 $moreenv{'CODE'}=$code;
-             $num_todo, 'inline', '75' );
+ 	     } else {
-         my $count = 0;
+ 		 $moreenv{'CODE'}=&num_to_letters($code);
-         foreach my $code ( sort(@allcodes) ) {
+ 	     }
-             my $file_num = int( $count / $number_per_page );
+              my $actual_seq = \@master_seq;
-             if ( $code_type eq 'number' ) {
+              if ($randomorder || $randompick) {
-                 $moreenv{'CODE'} = $code;
+                  $env{'form.CODE'} = $moreenv{'CODE'};
-             }
+                  $actual_seq = master_seq_to_person_seq($map, \@master_seq,
-             else {
+                                                         undef,
-                 $moreenv{'CODE'} = &num_to_letters($code);
+                                                         $moreenv{'CODE'}, 1);
-             }
+                  delete($env{'form.CODE'});
-             my ( $output, $fullname, $printed ) =
+              }
-               &print_resources( $r, $helper, 'anonymous', $type, \%moreenv,
+ 	     my ($output,$fullname, $printed)=
-                 \@master_seq, $flag_latex_header_remove, $LaTeXwidth );
+ 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
-             $resources_printed .= ":";
+ 				  $actual_seq,$flag_latex_header_remove,
-             $print_array[$file_num] .= $output;
+ 				  $LaTeXwidth);
-             &Apache::lonhtmlcommon::Increment_PrgWin( $r, \%prog_state,
+ 	     $resources_printed .= ":";
-                 &mt('last assignment') . ' ' . $fullname );
+ 	     $print_array[$file_num].=$output;
-             $flag_latex_header_remove = 'YES';
+ 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-             $count++;
+ 				       &mt('last assignment').' '.$fullname);
-             if ( &Apache::loncommon::connection_aborted($r) ) { last; }
+ 	     $flag_latex_header_remove = 'YES';
-         }
+ 	     $count++;
-         &Apache::lonhtmlcommon::Close_PrgWin( $r, \%prog_state );
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
-         $result .= $print_array[0] . '  \end{document}';
+ 	 }
-     }
+ 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-     elsif ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory' ) {
+ 	 $result .= $print_array[0].'  \end{document}';
+      } elsif ($print_type eq 'problems_from_directory') {
-         #prints selected problems from the subdirectory
+     #prints selected problems from the subdirectory
-         $selectionmade = 6;
+ 	$selectionmade = 6;
-         my @list_of_files = split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
+         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
-         @list_of_files = sort @list_of_files;
+ 	@list_of_files=sort @list_of_files;
-         my $flag_latex_header_remove = 'NO';
+ 	my $flag_latex_header_remove = 'NO';
-         my $rndseed                  = time;
+ 	my $rndseed=time;
-         if ( $helper->{'VARS'}->{'curseed'} ) {
+ 	if ($helper->{'VARS'}->{'curseed'}) {
-             $rndseed = $helper->{'VARS'}->{'curseed'};
+ 	    $rndseed=$helper->{'VARS'}->{'curseed'};
-         }
+ 	}
-         for ( my $i = 0 ; $i <= $#list_of_files ; $i++ ) {
+ 	for (my $i=0;$i<=$#list_of_files;$i++) {
-             &Apache::lonenc::reset_enc();
-             my $urlp = $list_of_files[$i];
+ 	    &Apache::lonenc::reset_enc();
-             $urlp =~ s|//|/|;
-             if ( $urlp =~ /\// ) {
-                 $form{'problem_split'} = $parmhash{'problem_stream_switch'};
-                 $form{'rndseed'}       = $rndseed;
-                 if ( $urlp =~ m|/home/([^/]+)/public_html| ) {
-                     $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
-                 }
-                 else {
-                     $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
-                 }
-                 $resources_printed .= $urlp . ':';
-                 my $texversion =
-                   &ssi_with_retries( $urlp, $ssi_retry_count, %form );
-                 if (   ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' )
-                     || ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only' ) )
-                 {
-                     #  Don't permanently pervert %form:
-                     my %answerform = %form;
-                     $answerform{'grade_target'}       = 'answer';
-                     $answerform{'answer_output_mode'} = 'tex';
-                     $answerform{'latex_type'} =
-                       $helper->{'VARS'}->{'LATEX_TYPE'};
-                     $answerform{'rndseed'} = $rndseed;
-                     $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' ) {
-                             $texversion .= '\vskip 0 mm \noindent ';
-                             $texversion .=
-                               &path_to_problem( $urlp, $LaTeXwidth );
-                         }
-                         else {
-                             $texversion .=
- '\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-                             my $URLpath = $urlp;
-                             $URLpath =~ s/~([^\/]+)/public_html\/$1\/$1/;
-                             $texversion .=
-                               &path_to_problem( $URLpath, $LaTeXwidth );
-                         }
-                         $texversion .=
-                           '\vskip 1 mm ' . $answer . '\end{document}';
-                     }
-                 }
+ 	    my $urlp = $list_of_files[$i];
+ 	    $urlp=~s|//|/|;
+ 	    if ($urlp=~/\//) {
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 		$form{'rndseed'}=$rndseed;
+ 		$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') ||
+ 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ 		    #  Don't permanently pervert %form:
+ 		    my %answerform = %form;
+ 		    $answerform{'grade_target'}='answer';
+ 		    $answerform{'answer_output_mode'}='tex';
+ 		    $answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		    $answerform{'rndseed'}=$rndseed;
+ 		    $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') {
+ 			    $texversion.='\vskip 0 mm \noindent ';
+ 			    $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}';
+ 		    }
+ 		}
                  #this chunk is responsible for printing the path to problem
-                 my $newurlp = $urlp;
+ 		my $newurlp=&path_to_problem($urlp,$LaTeXwidth);
-                 if ( $newurlp =~ /~/ ) {
+ 		$texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
-                     $newurlp =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ 		if ($flag_latex_header_remove ne 'NO') {
-                 }
+ 		    $texversion = &latex_header_footer_remove($texversion);
-                 $newurlp = &path_to_problem( $newurlp, $LaTeXwidth );
+ 		} else {
-                 $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 $newurlp/;
+ 		    $texversion =~ s/\\end{document}//;
-                 if ( $flag_latex_header_remove ne 'NO' ) {
+ 		}
-                     $texversion = &latex_header_footer_remove($texversion);
+ 		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
-                 }
+ 		    $texversion=&IndexCreation($texversion,$urlp);
-                 else {
+ 		}
-                     $texversion =~ s/\\end{document}//;
+ 		if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
-                 }
+ 		    $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
-                 if ( $helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes' ) {
-                     $texversion = &IndexCreation( $texversion, $urlp );
+ 		}
-                 }
+ 		$result .= $texversion;
-                 if ( $helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes' ) {
+ 	    }
-                     $texversion =~
+ 	    $flag_latex_header_remove = 'YES';
- s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+ 	}
+ 	if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;}
-                 }
+ 	$result .= '\end{document}';
-                 $result .= $texversion;
-             }
-             $flag_latex_header_remove = 'YES';
-         }
-         if ( $helper->{VARS}->{'construction'} eq '1' ) {
-             $result =~ s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;
-         }
-         $result .= '\end{document}';
      }
  #-------------------------------------------------------- corrections for the different page formats
- # Only post process if that has not been turned off e.g. by a raw latex resource.
+     # Only post process if that has not been turned off e.g. by a raw latex resource.
      if ($do_postprocessing) {
-         $result = &page_format_transformation(
+ 	$result = &page_format_transformation($papersize,
-             $papersize,
+ 					      $laystyle,$numberofcolumns,
-             $laystyle,
+ 					      $print_type,$result,
-             $numberofcolumns,
+ 					      $helper->{VARS}->{'assignment'},
-             $helper->{'VARS'}->{'PRINT_TYPE'},
+ 					      $helper->{'VARS'}->{'TABLE_CONTENTS'},
-             $result,
+ 					      $helper->{'VARS'}->{'TABLE_INDEX'},
-             $helper->{VARS}->{'assignment'},
+ 					      $selectionmade);
-             $helper->{'VARS'}->{'TABLE_CONTENTS'},
+ 	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
-             $helper->{'VARS'}->{'TABLE_INDEX'},
+ 				     $helper->{'VARS'}->{'ANSWER_TYPE'});
-             $selectionmade
+ 	#if ($numberofcolumns == 1) {
-         );
+ 	$result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
-         $result =
+ 	$result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
-           &latex_corrections( $number_of_columns, $result, $selectionmade,
+ 	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-             $helper->{'VARS'}->{'ANSWER_TYPE'} );
+ 	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+ 	#}
-         #if ($numberofcolumns == 1) {
-         $result =~
- s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
-         $result =~
- s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
-         $result =~
- s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-         $result =~
- s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-         #}
      }
      # Set URLback if this is a construction space print so we can provide
      # a link to the resource being edited.
      #
-     my $URLback = '';    #link to original document
+     my $URLback=''; #link to original document
-     if ( $helper->{'VARS'}->{'construction'} eq '1' ) {
+     if ($helper->{'VARS'}->{'construction'} eq '1') {
+ 	$URLback=$helper->{'VARS'}->{'filename'};
-         #prints resource from the construction space
-         $URLback = '/' . $helper->{'VARS'}->{'filename'};
-         if ( $URLback =~ /([^?]+)/ ) {
-             $URLback = $1;
-             $URLback =~ s|^/~|/priv/|;
-         }
      }
      #
      # Final adjustment of the font size:
      #
      $result = set_font_size($result);
-     #-- writing .tex file in prtspool
+     # Insert any babel headers required.
-     my $temp_file;
-     my $identifier = &Apache::loncommon::get_cgi_id();
-     my $filename =
- "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
-     if ( !( $#print_array > 0 ) ) {
-         unless ( $temp_file = Apache::File->new( '>' . $filename ) ) {
-             $r->log_error("Couldn't open $filename for output $!");
-             return SERVER_ERROR;
-         }
-         print $temp_file $result;
-         my $begin = index( $result, '\begin{document}', 0 );
-         my $inc = substr( $result, 0, $begin + 16 );
-     }
-     else {
-         my $begin = index( $result, '\begin{document}', 0 );
-         my $inc = substr( $result, 0, $begin + 16 );
-         for ( my $i = 0 ; $i <= $#print_array ; $i++ ) {
-             if ( $i == 0 ) {
-                 $print_array[$i] = $result;
-             }
-             else {
-                 $print_array[$i] .= '\end{document}';
-                 $print_array[$i] =
-                   &latex_corrections( $number_of_columns, $print_array[$i],
-                     $selectionmade, $helper->{'VARS'}->{'ANSWER_TYPE'} );
-                 my $anobegin =
-                   index( $print_array[$i], '\setcounter{page}', 0 );
-                 substr( $print_array[$i], 0, $anobegin ) = '';
-                 $print_array[$i] = $inc . $print_array[$i];
-             }
-             my $temp_file;
-             my $newfilename = $filename;
-             my $num         = $i + 1;
-             $newfilename =~ s/\.tex$//;
-             $newfilename = sprintf( "%s_%03d.tex", $newfilename, $num );
-             unless ( $temp_file = Apache::File->new( '>' . $newfilename ) ) {
-                 $r->log_error("Couldn't open $newfilename for output $!");
-                 return SERVER_ERROR;
-             }
-             print $temp_file $print_array[$i];
-         }
-     }
-     my $student_names = '';
-     if ( $#print_array > 0 ) {
-         for ( my $i = 0 ; $i <= $#print_array ; $i++ ) {
-             $student_names .= $student_names[$i] . '_ENDPERSON_';
-         }
-     }
-     else {
-         if ( $#student_names > -1 ) {
-             $student_names = $student_names[0] . '_ENDPERSON_';
-         }
-         else {
-             my $fullname = &get_name( $env{'user.name'}, $env{'user.domain'} );
-             $student_names = join( ':',
-                 $env{'user.name'}, $env{'user.domain'},
-                 $env{'request.course.sec'}, $fullname )
-               . '_ENDPERSON_' . '_END_';
-         }
-     }
-     # logic for now is too complex to trace if this has been defined
+     $result       = &collect_languages($result);
-     #  yet.
-     my $cnum = $env{ 'course.' . $env{'request.course.id'} . '.num' };
-     my $cdom = $env{ 'course.' . $env{'request.course.id'} . '.domain' };
-     &Apache::lonnet::appenv(
-         {
-             'cgi.' . $identifier . '.file'      => $filename,
-             'cgi.' . $identifier . '.layout'    => $laystyle,
-             'cgi.' . $identifier . '.numcol'    => $numberofcolumns,
-             'cgi.' . $identifier . '.paper'     => $papersize,
-             'cgi.' . $identifier . '.selection' => $selectionmade,
-             'cgi.'
-               . $identifier
-               . '.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
-             'cgi.'
-               . $identifier
-               . '.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
-             'cgi.' . $identifier . '.role'          => $perm{'pav'},
-             'cgi.' . $identifier . '.numberoffiles' => $#print_array,
-             'cgi.' . $identifier . '.studentnames'  => $student_names,
-             'cgi.' . $identifier . '.backref'       => $URLback,
-         }
-     );
-     &Apache::lonnet::appenv(
-         {
-             "cgi.$identifier.user"      => $env{'user.name'},
-             "cgi.$identifier.domain"    => $env{'user.domain'},
-             "cgi.$identifier.courseid"  => $cnum,
-             "cgi.$identifier.coursedom" => $cdom,
-             "cgi.$identifier.resources" => $resources_printed
-         }
-     );
-     my $end_page      = &Apache::loncommon::end_page();
-     my $continue_text = &mt('Continue');
+ #-- writing .tex file in prtspool
+     my $temp_file;
+     my $identifier = &Apache::loncommon::get_cgi_id();
+     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
+     if (!($#print_array>0)) {
+        unless ($temp_file = Apache::File->new('>'.$filename)) {
+ 	  $r->log_error("Couldn't open $filename for output $!");
+ 	  return SERVER_ERROR;
+        }
+        print $temp_file $result;
+        my $begin=index($result,'\begin{document}',0);
+        my $inc=substr($result,0,$begin+16);
+     } else {
+        my $begin=index($result,'\begin{document}',0);
+        my $inc=substr($result,0,$begin+16);
+        for (my $i=0;$i<=$#print_array;$i++) {
+ 	  if ($i==0) {
+ 	      $print_array[$i]=$result;
+ 	  } else {
+ 	      $print_array[$i].='\end{document}';
+ 	      $print_array[$i] =
+ 		&latex_corrections($number_of_columns,$print_array[$i],
+ 				   $selectionmade,
+ 				   $helper->{'VARS'}->{'ANSWER_TYPE'});
+ 	      my $anobegin=index($print_array[$i],'\setcounter{page}',0);
+ 	      substr($print_array[$i],0,$anobegin)='';
+ 	      $print_array[$i]=$inc.$print_array[$i];
+ 	  }
+ 	  my $temp_file;
+ 	  my $newfilename=$filename;
+ 	  my $num=$i+1;
+ 	  $newfilename =~s/\.tex$//;
+ 	  $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
+ 	  unless ($temp_file = Apache::File->new('>'.$newfilename)) {
+ 	      $r->log_error("Couldn't open $newfilename for output $!");
+ 	      return SERVER_ERROR;
+ 	  }
+ 	  print $temp_file $print_array[$i];
+        }
+     }
+     my $student_names='';
+     if ($#print_array>0) {
+         for (my $i=0;$i<=$#print_array;$i++) {
+   	  $student_names.=$student_names[$i].'_ENDPERSON_';
+ 	}
+     } else {
+ 	if ($#student_names>-1) {
+ 	   $student_names=$student_names[0].'_ENDPERSON_';
+ 	} else {
+            my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
+ 	   $student_names=join(':',$env{'user.name'},$env{'user.domain'},
+ 				    $env{'request.course.sec'},$fullname).
+ 					'_ENDPERSON_'.'_END_';
+ 	}
+      }
+      # logic for now is too complex to trace if this has been defined
+      #  yet.
+      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+      &Apache::lonnet::appenv({'cgi.'.$identifier.'.file'   => $filename,
+ 				'cgi.'.$identifier.'.layout'  => $laystyle,
+ 				'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
+ 				'cgi.'.$identifier.'.paper'  => $papersize,
+ 				'cgi.'.$identifier.'.selection' => $selectionmade,
+ 				'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+ 				'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+ 				'cgi.'.$identifier.'.role' => $perm{'pav'},
+ 				'cgi.'.$identifier.'.numberoffiles' => $#print_array,
+ 				'cgi.'.$identifier.'.studentnames' => $student_names,
+ 				'cgi.'.$identifier.'.backref' => $URLback,});
+     &Apache::lonnet::appenv({"cgi.$identifier.user"    => $env{'user.name'},
+ 				"cgi.$identifier.domain"  => $env{'user.domain'},
+ 				"cgi.$identifier.courseid" => $cnum,
+ 				"cgi.$identifier.coursedom" => $cdom,
+ 				"cgi.$identifier.resources" => $resources_printed});
+     my $end_page = &Apache::loncommon::end_page();
+     my $continue_text = &mt('Continue');
      # 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(
+         $r->print('<br /><p class="LC_error">'.&mt('An unrecoverable network error occurred:').'</p><p>'.
-                 '<br /><p class="LC_error">'
+                   &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:').
-               . &mt('An unrecoverable network error occurred:')
+                   '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
-               . '</p><p>'
+                   '</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 />'.
-               . &mt(
+                   &mt('You may be able to reprint the individual resources for which this error occurred, as the issue may be temporary.').
- '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 />'.&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).'</p><p>'.
-               )
+                   &mt('We apologize for the inconvenience.').'</p>'.
-               . '<br />'
+                   '<a href="/cgi-bin/printout.pl?'.$identifier.'">'.$continue_text.'</a>'.$end_page);
-               . $ssi_last_error_resource
+     } else {
-               . '<br />'
+ 	$r->print(<<FINALEND);
-               . $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 />'
-               . &mt(
- 'You may be able to reprint the individual resources for which this error occurred, as the issue may be temporary.'
-               )
-               . '<br />'
-               . &mt(
- 'If the error persists, please contact the [_1] for assistance.',
-                 $helpurl
-               )
-               . '</p><p>'
-               . &mt('We apologize for the inconvenience.') . '</p>'
-               . '<a href="/cgi-bin/printout.pl?'
-               . $identifier . '">'
-               . $continue_text . '</a>'
-               . $end_page
-         );
-     }
-     else {
-         $r->print(<<FINALEND);
  <br />
  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
  <a href="/cgi-bin/printout.pl?$identifier">$continue_text</a>
  $end_page
  FINALEND
-     }    # endif ssi errors.
+     }                                     # endif ssi errors.
  }
  sub get_CODE {
-     my ( $all_codes, $num, $seed, $size, $type ) = @_;
+     my ($all_codes,$num,$seed,$size,$type)=@_;
-     my $max = '1' . '0' x $size;
+     my $max='1'.'0'x$size;
      my $newcode;
-     while (1) {
+     while(1) {
-         $newcode = sprintf( "%0" . $size . "d", int( rand($max) ) );
+ 	$newcode=sprintf("%0".$size."d",int(rand($max)));
-         if ( !exists( $$all_codes{$newcode} ) ) {
+ 	if (!exists($$all_codes{$newcode})) {
-             $$all_codes{$newcode} = 1;
+ 	    $$all_codes{$newcode}=1;
-             if ( $type eq 'number' ) {
+ 	    if ($type eq 'number' ) {
-                 return $newcode;
+ 		return $newcode;
-             }
+ 	    } else {
-             else {
+ 		return &num_to_letters($newcode);
-                 return &num_to_letters($newcode);
+ 	    }
-             }
+ 	}
-         }
      }
  }
  sub print_resources {
-     my ( $r, $helper, $person, $type, $moreenv, $master_seq,
+     my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
-         $remove_latex_header, $LaTeXwidth )
+ 	$LaTeXwidth)=@_;
-       = @_;
+     my $current_output = '';
-     my $current_output = '';
+     my $printed = '';
-     my $printed        = '';
+     my ($username,$userdomain,$usersection) = split /:/,$person;
-     my ( $username, $userdomain, $usersection ) = split /:/, $person;
+     my $fullname = &get_name($username,$userdomain);
-     my $fullname = &get_name( $username, $userdomain );
+     my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
-     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
-         $fullname = "CODE - " . $moreenv->{'CODE'};
+     # 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 $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
      &Apache::lonxml::clear_problem_counter();
-     my %page_breaks = &get_page_breaks($helper);
+     my %page_breaks  = &get_page_breaks($helper);
-     my $columns_in_format = ( split( /\|/, $helper->{'VARS'}->{'FORMAT'} ) )[1];
+     my $columns_in_format = (split(/\|/,$helper->{'VARS'}->{'FORMAT'}))[1];
      #
      #   end each student with a
      #   Special that allows the post processor to even out the page
      #   counts later.  Nasty problem this... it would be really
      #   nice to put the special in as a postscript comment
- Line 3291  sub print_resources {
+ Line 3610  sub print_resources {
      #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
      #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
      #
      my $syllabus_first = 0;
-     foreach my $curresline ( @{$master_seq} ) {
+     my $current_assignment = "";
-         if ( defined $page_breaks{$curresline} ) {
+     my $assignment;
-             if ( $i != 0 ) {
+     my $courseidinfo = &get_course();
-                 $current_output .= "\\newpage\n";
-             }
-         }
-         $current_output .= &get_extra_vspaces( $helper, $curresline );
-         $i++;
-         if (
+     foreach my $curresline (@{$master_seq})  {
-             !(
+ 	if (defined $page_breaks{$curresline}) {
-                 $type eq 'problems'
+ 	    if($i != 0) {
-                 && ( $curresline !~
+ 		$current_output.= "\\newpage\n";
-                     m/\.(problem|exam|quiz|assess|survey|form|library)$/ )
+ 	    }
-             )
+ 	}
-           )
+ 	$current_output .= &get_extra_vspaces($helper, $curresline);
-         {
+ 	$i++;
-             my ( $map, $id, $res_url ) =
+ 	my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
-               &Apache::lonnet::decode_symb($curresline);
-             if ( &Apache::lonnet::allowed( 'bre', $res_url ) ) {
+ 	# See if we need to emit a new header:
-                 if (   $res_url !~ m|^ext/|
-                     && $res_url =~
+ 	if ( !($type eq 'problems' &&
- /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/
+ 	       ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
-                   )
+ 	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
-                 {
+ 		next;
-                     $printed .= $curresline . ':';
+ 	    }
-                     &Apache::lonxml::remember_problem_counter();
+ 	    $actually_printed++; # we're going to print one.
-                     my $rendered =
+ 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
-                       &get_student_view_with_retries( $curresline,
+ 		if ($res_url!~m|^ext/|
-                         $ssi_retry_count, $username, $userdomain,
+ 		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
-                         $env{'request.course.id'},
+ 		    $printed .= $curresline.':';
-                         'tex', $moreenv );
+ 		    &Apache::lonxml::remember_problem_counter();
-                     if (   ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' )
-                         || ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only' ) )
+ 		    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') {
-         #   Use a copy of the hash so we don't pervert it on future loop passes.
+                             if (!($rendered =~ /\\begin\{document\}/)) {
-                         my %answerenv = %{$moreenv};
+                                 $rendered = &print_latex_header().$rendered;
-                         $answerenv{'answer_output_mode'} = 'tex';
+                             }
-                         $answerenv{'latex_type'} =
-                           $helper->{'VARS'}->{'LATEX_TYPE'};
-                         &Apache::lonxml::restore_problem_counter();
-                         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/;
                          }
-                         else {
+ ;
+                         if ($remove_latex_header eq 'YES') {
-                             my $header =
+                             $rendered = &latex_header_footer_remove($rendered);
-                               &print_latex_header(
+                         } else {
-                                 $helper->{'VARS'}->{'LATEX_TYPE'} );
+                             $rendered =~ s/\\end{document}\d*//;
-                             $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 ';
-                             $body .= &path_to_problem( $res_url, $LaTeXwidth );
-                             $body .= '\vskip 1 mm ' . $ansrendered;
-                             $body     = &encapsulate_minipage($body);
-                             $rendered = $header . $body;
                          }
                      }
-                     if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
-                         my $url        = &Apache::lonnet::clutter($res_url);
+ 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-                         my $annotation = &annotate($url);
+ 			#   Use a copy of the hash so we don't pervert it on future loop passes.
-                         $rendered =~
+ 			my %answerenv = %{$moreenv};
-                           s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 			$answerenv{'answer_output_mode'}='tex';
-                     }
-                     my $junk;
-                     if ( $remove_latex_header eq 'YES' ) {
+ 			$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-                         $rendered = &latex_header_footer_remove($rendered);
-                     }
+ 			&Apache::lonxml::restore_problem_counter();
-                     else {
-                         $rendered =~ s/\\end{document}//;
+ 			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%answerenv);
-                     }
-                     $current_output .= $rendered;
+ 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-                 }
+ 			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
-                 elsif (
+ 			} else {
-                     $res_url =~ /\/(smppg|syllabus|aboutme|bulletinboard)$/ )
-                 {
-                     if ( $i == 1 ) {
+ 			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-                         $syllabus_first = 1;
+                             unless ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') {
-                     }
+                                 $header =~ s/\\begin{document}//;     #<<<<<
-                     $printed .= $curresline . ':';
+                             }
-                     my $rendered =
+ 			    my $title = &Apache::lonnet::gettitle($curresline);
-                       &get_student_view_with_retries( $curresline,
+ 			    $title = &Apache::lonxml::latex_special_symbols($title);
-                         $ssi_retry_count, $username, $userdomain,
+ 			    my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
-                         $env{'request.course.id'},
+ 			    $body     .=&path_to_problem($res_url,$LaTeXwidth);
-                         'tex', $moreenv );
+ 			    $body     .='\vskip 1 mm '.$ansrendered;
-                     if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 			    $body     = &encapsulate_minipage($body);
-                         my $url        = &Apache::lonnet::clutter($res_url);
+ 			    $rendered = $header.$body;
-                         my $annotation = &annotate($url);
+ 			}
-                         $annotation =~ s/(\\end{document})/$annotation$1/;
+ 		    }
-                     }
+ 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                     if ( $remove_latex_header eq 'YES' ) {
+ 			my $url = &Apache::lonnet::clutter($res_url);
-                         $rendered = &latex_header_footer_remove($rendered);
+ 			my $annotation = &annotate($url);
-                     }
+ 			$rendered =~  s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
-                     else {
+ 		    }
-                         $rendered =~ s/\\end{document}//;
+ 		    my $junk;
-                     }
+ 		    if ($remove_latex_header eq 'YES') {
-                     $current_output .= $rendered
+ 			$rendered = &latex_header_footer_remove($rendered);
-                       . '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
+ 		    } else {
-                 }
+ 			$rendered =~ s/\\end{document}//;
-                 elsif ( $res_url = ~/\.pdf$/ ) {
+ 		    }
-                     my $url      = &Apache::lonnet::clutter($res_url);
+ 		    $current_output .= $rendered;
-                     my $rendered = &include_pdf($url);
+ 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
-                     if ( $remove_latex_header ne 'NO' ) {
+ 		    if ($i == 1) {
-                         $rendered = &latex_header_footer_remove($rendered);
+ 			$syllabus_first = 1;
-                     }
+ 		    }
-                     $current_output .= $rendered;
+ 		    $printed .= $curresline.':';
-                 }
+ 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
-                 else {
+ 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                     my $rendered =
+ 			my $url = &Apache::lonnet::clutter($res_url);
-                       &unsupported( $res_url, $helper->{'VARS'}->{'LATEX_TYPE'},
+ 			my $annotation = &annotate($url);
-                         $curresline );
+ 			$annotation    =~ s/(\\end{document})/$annotation$1/;
-                     if ( $remove_latex_header ne 'NO' ) {
+ 		    }
-                         $rendered = &latex_header_footer_remove($rendered);
+ 		    if ($remove_latex_header eq 'YES') {
-                     }
+ 			$rendered = &latex_header_footer_remove($rendered);
-                     else {
+ 		    } else {
-                         $rendered =~ s/\\end{document}//;
+ 			$rendered =~ s/\\end{document}//;
-                     }
+ 		    }
-                     $current_output .= $rendered;
+ 		    $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);
-             $remove_latex_header = 'YES';
+ 		    my $rendered  = &include_pdf($url);
-         }
+ 		    if ($remove_latex_header ne 'NO') {
-         if ( &Apache::loncommon::connection_aborted($r) ) { last; }
+ 			$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}//;
+ 		    }
+ 		    $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, $usersection);
+ 	    my $header_start = ($columns_in_format == 1) ? '\lhead'
+ 		: '\fancyhead[LO]';
+ 	    $header_line = $header_start.'{'.$header_line.'}';
+ 	    $current_output = $current_output . $header_line;
+ 	    $current_assignment = $assignment;
+ 	}
+ 	if (&Apache::loncommon::connection_aborted($r)) { last; }
      }
+     # If we are printing incomplete it's possible we don't have
+     # anything to print.  The print subsystem is not so good at handling
+     # that so we're going to generate a stub that says there are no
+     # incomplete resources for the person.
+     #
-     my $courseidinfo = &get_course();
+     if ($actually_printed == 0) {
-     my $currentassignment =
+ 	$current_output  = &encapsulate_minipage("\\vskip -10mm \nNo incomplete resources\n \\vskip 100 mm { }\n");
-       &Apache::lonxml::latex_special_symbols( $helper->{VARS}->{'assignment'},
+ 	if ($remove_latex_header eq "NO") {
-         'header' );
+ 	    $current_output = &print_latex_header() . $current_output;
-     my $header_line =
+ 	} else {
-       &format_page_header( $LaTeXwidth, $parmhash{'print_header_format'},
+ 	    $current_output = &latex_header_footer_remove($current_output);
-         $currentassignment, $courseidinfo, $fullname, $usersection );
+ 	}
-     my $header_start =
+     }
-       ( $columns_in_format == 1 )
-       ? '\lhead'
+     if ($syllabus_first) {
-       : '\fancyhead[LO]';
+         $current_output =~ s/\\\\ Last updated:/Last updated:/
-     $header_line = $header_start . '{' . $header_line . '}';
-     if ( $current_output =~ /\\documentclass/ && ( !$syllabus_first ) ) {
-         $current_output =~
- s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
-     }
-     elsif ($syllabus_first) {
-         $current_output =~ s/\\\\ Last updated:/Last updated:/;
-     }
-     else {
-         my $blankpages =
-           '\clearpage\strut\clearpage' x $helper->{'VARS'}->{'EMPTY_PAGES'};
-         $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;
      }
+     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
+     my $header_line =
+     &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+                         $currentassignment, $courseidinfo, $fullname, $usersection);
+     my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
+     my $newheader = $header_start.'{'.$header_line.'}';
+     if ($current_output=~/\\documentclass/) {
+ 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;
+     } else {
+ 	my $blankpages =
+ 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
+ 	$current_output = '\strut\vspace*{-6 mm}\\newline'.
+ 	    &copyright_line().' \newpage '.$blankpages.$end_of_student.
+ 	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
+ 	    $newheader.$namepostfix. '} \vskip 5 mm '.$current_output;
+     }
      #
      #  Close the student bracketing.
      #
-     return ( $current_output, $fullname, $printed );
+     return ($current_output,$fullname, $printed);
  }
+ 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) ) {
+     if (!ref($helper)) {
-         return $helper;
+ 	return $helper;
      }
+     %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
-     %parmhash = &Apache::lonnet::coursedescription( $env{'request.course.id'} );
      #  If a figure conversion queue file exists for this user.domain
      # we delete it since it can only be bad (if it were good, printout.pl
      # would have deleted it the last time around.
-     my $conversion_queuefile =
+     my $conversion_queuefile = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
-       "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
+     if(-e $conversion_queuefile) {
-     if ( -e $conversion_queuefile ) {
+ 	unlink $conversion_queuefile;
-         unlink $conversion_queuefile;
      }
-     &output_data( $r, $helper, \%parmhash );
+     &output_data($r,$helper,\%parmhash);
      return OK;
  }
  use Apache::lonhelper;
  sub addMessage {
-     my $text      = shift;
+     my $text = shift;
      my $paramHash = Apache::lonhelper::getParamHash();
      $paramHash->{MESSAGE_TEXT} = $text;
      Apache::lonhelper::message->new();
  }
  sub init_perm {
      undef(%perm);
-     $perm{'pav'} = &Apache::lonnet::allowed( 'pav', $env{'request.course.id'} );
+     $perm{'pav'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});
-     if ( !$perm{'pav'} ) {
+     if (!$perm{'pav'}) {
-         $perm{'pav'} =
+ 	$perm{'pav'}=&Apache::lonnet::allowed('pav',
-           &Apache::lonnet::allowed( 'pav',
+ 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
-             $env{'request.course.id'} . '/' . $env{'request.course.sec'} );
+     }
-     }
+     $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
-     $perm{'pfo'} = &Apache::lonnet::allowed( 'pfo', $env{'request.course.id'} );
+     if (!$perm{'pfo'}) {
-     if ( !$perm{'pfo'} ) {
+ 	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
-         $perm{'pfo'} =
+ 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
-           &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 {
-     my ( $helper, $map ) = @_;
+     my ($helper,$map) = @_;
      my $message;
      my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
      my $navmap = Apache::lonnavmaps::navmap->new();
-     if ( defined($navmap) ) {
+     if (defined($navmap)) {
          my $res = $navmap->getResourceByUrl($map);
          if ($res) {
-             my $func =
+ 	    my $func =
-               sub { return ( $_[0]->is_map() && $_[0]->randomorder ); };
+ 	        sub { return ($_[0]->is_map() && $_[0]->randomorder); };
-             my @matches = $navmap->retrieveResources( $res, $func, 1, 1, 1 );
+ 	    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 {
-     else {
+         $message = "Retrieval of information about ordering of resources failed.";
-         $message =
+         return '<message type="warning">'.$message.'</message>';
-           "Retrieval of information about ordering of resources failed.";
-         return '<message type="warning">' . $message . '</message>';
      }
      return;
  }
- Line 3561  sub get_randomly_ordered_warning {
+ Line 3913  sub get_randomly_ordered_warning {
  sub printHelper {
      my $r = shift;
-     if ( $r->header_only ) {
+     if ($r->header_only) {
-         if ( $env{'browser.mathml'} ) {
+         if ($env{'browser.mathml'}) {
-             &Apache::loncommon::content_type( $r, 'text/xml' );
+             &Apache::loncommon::content_type($r,'text/xml');
-         }
+         } else {
-         else {
+             &Apache::loncommon::content_type($r,'text/html');
-             &Apache::loncommon::content_type( $r, 'text/html' );
          }
          $r->send_http_header;
          return OK;
      }
      # Send header, nocache
-     if ( $env{'browser.mathml'} ) {
+     if ($env{'browser.mathml'}) {
-         &Apache::loncommon::content_type( $r, 'text/xml' );
+         &Apache::loncommon::content_type($r,'text/xml');
-     }
+     } else {
-     else {
+         &Apache::loncommon::content_type($r,'text/html');
-         &Apache::loncommon::content_type( $r, 'text/html' );
      }
      &Apache::loncommon::no_cache($r);
      $r->send_http_header;
- Line 3586  sub printHelper {
+ Line 3936  sub printHelper {
      # Unfortunately, this helper is so complicated we have to
      # write it by hand
-     Apache::loncommon::get_unprocessed_cgi( $ENV{QUERY_STRING} );
+     Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
      my $helper = Apache::lonhelper::helper->new("Printing Helper");
      $helper->declareVar('symb');
      $helper->declareVar('postdata');
      $helper->declareVar('curseed');
      $helper->declareVar('probstatus');
      $helper->declareVar('filename');
      $helper->declareVar('construction');
      $helper->declareVar('assignment');
- Line 3604  sub printHelper {
+ Line 3954  sub printHelper {
      $helper->declareVar("STUDENTS");
      $helper->declareVar("EXTRASPACE");
-   #  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.
-   #
-     &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
-     # very first screen.
-     if ( $helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'} ) {
-         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'};
-             }
+     #  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.
+     #
+     &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
+     # very first screen.
+     if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {
+ 	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 (
+     if ($env{'form.postdata'}=~m{^/priv}) {
-         $env{'form.postdata'} =~ /^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/ )
+         $helper->{VARS}->{'filename'} = $env{'form.postdata'};
-     {
-         $helper->{VARS}->{'filename'}     = "~$1/$2";
          $helper->{VARS}->{'construction'} = 1;
-     }
+     } else {
-     else {
+         if ($env{'form.postdata'}) {
-         if ( $env{'form.postdata'} ) {
+             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
-             $helper->{VARS}->{'symb'} =
+ 	    if ( $helper->{VARS}->{'symb'} eq '') {
-               &Apache::lonnet::symbread( $env{'form.postdata'} );
+ 		$helper->{VARS}->{'postdata'} = $env{'form.postdata'};
-             if ( $helper->{VARS}->{'symb'} eq '' ) {
+ 	    }
-                 $helper->{VARS}->{'postdata'} = $env{'form.postdata'};
-             }
          }
-         if ( $env{'form.symb'} ) {
+         if ($env{'form.symb'}) {
              $helper->{VARS}->{'symb'} = $env{'form.symb'};
          }
-         if ( $env{'form.url'} ) {
+         if ($env{'form.url'}) {
-             $helper->{VARS}->{'symb'} =
+             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
-               &Apache::lonnet::symbread( $helper->{VARS}->{'postdata'} );
          }
      }
-     if ( $env{'form.symb'} ) {
+     if ($env{'form.symb'}) {
          $helper->{VARS}->{'symb'} = $env{'form.symb'};
      }
-     if ( $env{'form.url'} ) {
+     if ($env{'form.url'}) {
-         $helper->{VARS}->{'symb'} =
+         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
-           &Apache::lonnet::symbread( $helper->{VARS}->{'postdata'} );
      }
-     $helper->{VARS}->{'symb'} =
+     $helper->{VARS}->{'symb'}=
-       &Apache::lonenc::check_encrypt( $helper->{VARS}->{'symb'} );
+ 	&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
-     my ( $resourceTitle, $sequenceTitle, $mapTitle ) =
+     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
-       &details_for_menu($helper);
+     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
-     if ( $sequenceTitle ne '' ) {
-         $helper->{VARS}->{'assignment'} = $sequenceTitle;
-     }
      # Extract map
      my $symb = $helper->{VARS}->{'symb'};
-     my ( $map, $id, $url );
+     my ($map, $id, $url);
      my $subdir;
-     my $is_published = 0;    # True when printing from resource space.
+     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'} ) {
+     if ($helper->{VARS}->{'construction'}) {
-         $resourceTitle = substr( $helper->{VARS}->{'filename'},
+         $resourceTitle = substr($helper->{VARS}->{'filename'},
-             rindex( $helper->{VARS}->{'filename'}, '/' ) + 1 );
+                                 rindex($helper->{VARS}->{'filename'}, '/')+1);
-         $subdir = substr( $helper->{VARS}->{'filename'},
+         $subdir = substr($helper->{VARS}->{'filename'},
-, rindex( $helper->{VARS}->{'filename'}, '/' ) + 1 );
+, rindex($helper->{VARS}->{'filename'}, '/') + 1);
-     }
+     } else {
-     else {
+ 	# From course space:
-         # From course space:
+ 	if ($symb ne '') {
+ 	    ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
-         if ( $symb ne '' ) {
+ 	    $helper->{VARS}->{'postdata'} =
-             ( $map, $id, $url ) = &Apache::lonnet::decode_symb($symb);
+ 		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
-             $helper->{VARS}->{'postdata'} =
+ 	    my $navmap = Apache::lonnavmaps::navmap->new();
-               &Apache::lonenc::check_encrypt( &Apache::lonnet::clutter($url) );
+ 	    my $res   = $navmap->getBySymb($symb);
-         }
+ 	    $res_printable  = $res->resprintable() || $userCanPrint; #printability in course context
-         else {
+ 	    ($res_printstartdate, $res_printenddate) = 	&get_print_dates($res);
-             $url          = $helper->{VARS}->{'postdata'};
+ 	    ($course_open, $course_close) = &course_print_dates($res);
-             $is_published = 1;                            # From resource space.
+ 	    ($map_open, $map_close)       = &map_print_dates($res);
-         }
-         $url = &Apache::lonnet::clutter($url);
+ 	} else {
-         if ( !$resourceTitle )
+ 	    # Resource space.
-         {    # if the resource doesn't have a title, use the filename
+ 	    $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 );
+             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
          }
-         $subdir = &Apache::lonnet::filelocation( "", $url );
+         $subdir = &Apache::lonnet::filelocation("", $url);
      }
-     if ( !$helper->{VARS}->{'curseed'} && $env{'form.curseed'} ) {
+     if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
-         $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'};
+     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+ 	$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
      }
      my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
- Line 3745  sub printHelper {
+ Line 4101  sub printHelper {
      my $printChoices = [];
      my $paramHash;
-     if ($resourceTitle) {
+     # If there is a current resource and it is printable
-         push @{$printChoices},
+     # Give that as a choice.
-           [
-             "<b><i>$resourceTitle</i></b> ("
+     if ($resourceTitle && $res_printable) {
-               . &mt('the resource you just saw on the screen') . ")",
+         push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
-             '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 =
+     my $isProblemOrMap = '($res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice())';
- '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
+     $isProblemOrMap .= $isPrintable unless $userCanPrint;
-     my $isNotMap = '!$res->is_sequence()';
+     my $isNotMap = '(!$res->is_sequence())';
+     $isNotMap .= $isPrintable unless $userCanPrint;
      $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
-     my $isMap      = '$res->is_map()';
+     my $isMap = '$res->is_map()';
-     my $symbFilter = '$res->shown_symb()';
+     $isMap .= $isPrintable unless $userCanPrint;
-     my $urlValue   = '$res->link()';
+     my $symbFilter = '$res->shown_symb() ';
+     my $urlValue = '$res->link()';
      $helper->declareVar('SEQUENCE');
      # If we're in a sequence...
      my $start_new_option;
-     if ( $perm{'pav'} ) {
+     if ($perm{'pav'}) {
-         $start_new_option =
+ 	$start_new_option =
-             "<option text='"
+ 	    "<option text='".&mt('Start new page[_1]before selected','<br />').
-           . &mt('Start new page<br />before selected')
+ 	    "' variable='FINISHPAGE' />".
-           . "' variable='FINISHPAGE' />"
+ 	    "<option text='".&mt('Extra space[_1]before selected','<br />').
-           . "<option text='"
+ 	    "' variable='EXTRASPACE' type='text' />" .
-           . &mt('Extra space<br />before selected')
+ 	    "<option " .
-           . "' variable='EXTRASPACE' type='text' />"
+ 	    "' variable='POSSIBLE_RESOURCES' type='hidden' />".
-           . "<option "
+ 	    "<option text='".&mt('Space units[_1]check for mm','<br />').
-           . "' variable='POSSIBLE_RESOURCES' type='hidden' />"
+ 	    "' variable='EXTRASPACE_UNITS' type='checkbox' />"
-           . "<option text='"
+ 	    ;
-           . &mt('Space units<br />check for mm')
-           . "' variable='EXTRASPACE_UNITS' type='checkbox' />";
      }
- Line 3791  sub printHelper {
+ Line 4149  sub printHelper {
      my $page_ispage;
      my $page_title;
-     if ( !$helper->{VARS}->{'construction'} ) {
+     if (!$helper->{VARS}->{'construction'}) {
-         my $varspostdata   = $helper->{VARS}->{'postdata'};
+ 	my $varspostdata = $helper->{VARS}->{'postdata'};
-         my $varsassignment = $helper->{VARS}->{'assignment'};
+ 	my $varsassignment = $helper->{VARS}->{'assignment'};
-         my $page_navmap    = Apache::lonnavmaps::navmap->new();
+ 	my $page_navmap         = Apache::lonnavmaps::navmap->new();
-         if ( defined($page_navmap) ) {
+ 	if (defined($page_navmap)) {
-             my @page_resources = $page_navmap->retrieveResources($url);
+ 	    my @page_resources      = $page_navmap->retrieveResources($url);
-             if ( defined( $page_resources[0] ) ) {
+ 	    if(defined($page_resources[0])) {
-                 $page_ispage = $page_resources[0]->is_page();
+ 		$page_ispage       = $page_resources[0]->is_page();
-                 $page_title  = $page_resources[0]->title();
+ 		$page_title     = $page_resources[0]->title();
-                 my $resourcesymb = $page_resources[0]->symb();
+ 		my $resourcesymb   = $page_resources[0]->symb();
-                 my ( $pagemap, $pageid, $pageurl ) =
+ 		my ($pagemap, $pageid, $pageurl) = &Apache::lonnet::decode_symb($symb);
-                   &Apache::lonnet::decode_symb($symb);
+ 		if ($page_ispage) {
-                 if ($page_ispage) {
+ 		    push @{$printChoices},
-                     push @{$printChoices},
+ 		    [&mt('Selected [_1]Problems[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'),
-                       [
+ 		     'map_problems_in_page',
-                         &mt(
+ 		     'CHOOSE_PROBLEMS_PAGE'];
-                             'Selected [_1]Problems[_2] from page [_3]',
+ 		    push @{$printChoices},
-                             '<b>', '</b>', '<b><i>' . $page_title . '</i></b>'
+ 		    [&mt('Selected [_1]Resources[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'),
-                         ),
+ 		     'map_resources_in_page',
-                         'map_problems_in_page',
+ 		     'CHOOSE_RESOURCES_PAGE'];
-                         'CHOOSE_PROBLEMS_PAGE'
+ 		}
-                       ];
+         my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS_PAGE',
-                     push @{$printChoices},
+ 							'Select Problem(s) to print',
-                       [
+ 							"multichoice='1' toponly='1' addstatus='1' closeallpages='1'",
-                         &mt(
+ 							'RESOURCES',
-                             'Selected [_1]Resources[_2] from page [_3]',
+ 							'PAGESIZE',
-                             '<b>', '</b>', '<b><i>' . $page_title . '</i></b>'
+ 							$url,
-                         ),
+ 							$isProblem, '',  $symbFilter,
-                         'map_resources_in_page',
+ 							$start_new_option);
-                         'CHOOSE_RESOURCES_PAGE'
-                       ];
-                 }
+       $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
-                 my $helperFragment = &generate_resource_chooser(
+ 						    'Select Resource(s) to print',
-                     'CHOOSE_PROBLEMS_PAGE',
+ 						    'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-                     'Select Problem(s) to print',
+ 						    'RESOURCES',
- "multichoice='1' toponly='1' addstatus='1' closeallpages='1'",
+ 						    'PAGESIZE',
-                     'RESOURCES',
+ 						    $url,
-                     'PAGESIZE',
+ 						    $isNotMap, '', $symbFilter,
-                     $url,
+ 						    $start_new_option);
-                     $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"',
-                     'RESOURCES',
-                     'PAGESIZE',
-                     $url,
-                     $isNotMap,
-                     '',
-                     $symbFilter,
-                     $start_new_option
-                 );
-                 &Apache::lonxml::xmlparse( $r, 'helper', $helperFragment );
-             }
-         }
+ 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+ 	    }
+ 	}
      }
-     if (   ( $helper->{'VAR'}->{'construction'} ne '1' )
+     if (($helper->{'VAR'}->{'construction'} ne '1' ) &&
-         && $helper->{VARS}->{'postdata'}
+ 	$helper->{VARS}->{'postdata'} &&
-         && $helper->{VARS}->{'assignment'} )
+ 	$helper->{VARS}->{'assignment'}) {
-     {
+ 	# BZ 5209 - Print incomplete problems from sequence:
+ 	# the exact form of this depends on whether or not we are privileged or a mere
+ 	# plebe of s student:
+ 	my $printSelector = 'map_incomplete_problems_seq';
+ 	my $nextState     = 'CHOOSE_INCOMPLETE_SEQ';
+ 	my $textSuffix    = '';
+ 	if ($userCanPrint)  {
+ 	    $printSelector = 'map_incomplete_problems_people_seq';
+ 	    $nextState     = 'CHOOSE_INCOMPLETE_PEOPLE_SEQ';
+ 	    $textSuffix    = ' for selected students';
+ 	    my $helperStates =
+ 		&create_incomplete_folder_selstud_helper($helper, $map);
+ 	    &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+ 	} else {
+ 	    if (&printable($map_open, $map_close)) {
+ 		my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
+ 		&Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+ 	    } else {
+ 		# TODO: Figure out how to break the news...this folder is not printable.
+ 	    }
+ 	}
+ 	if ($userCanPrint || &printable($map_open, $map_close)) {
+ 	    push(@{$printChoices},
+ 		 [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
+ 		      '<b>', '</b>',
+ 		      '<b><i>'. $sequenceTitle . '</b></i>'),
+ 		  $printSelector,
+ 		  $nextState]);
+ 	}
          # Allow problems from sequence
-         push @{$printChoices},
+ 	if ($userCanPrint || &printable($map_open, $map_close)) {
-           [
+ 	    push @{$printChoices},
-             &mt(
+ 	    [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
-                 'Selected [_1]Problems[_2] from folder [_3]',
+ 	     'map_problems',
-                 '<b>', '</b>', '<b><i>' . $sequenceTitle . '</i></b>'
+ 	     'CHOOSE_PROBLEMS'];
-             ),
+ 	    # Allow all resources from sequence
-             'map_problems',
+ 	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
-             'CHOOSE_PROBLEMS'
+ 				    'map_problems_pages',
-           ];
+ 				    'CHOOSE_PROBLEMS_HTML'];
+ 	    my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
-         # Allow all resources from sequence
+ 							    'Select Problem(s) to print',
-         push @{$printChoices},
+ 							    'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-           [
+ 							    'RESOURCES',
-             &mt(
+ 							    'PAGESIZE',
-                 'Selected [_1]Resources[_2] from folder [_3]',
+ 							    $map,
-                 '<b>', '</b>', '<b><i>' . $sequenceTitle . '</i></b>'
+ 							    $isProblem, '',
-             ),
+ 							    $symbFilter,
-             'map_problems_pages',
+ 							    $start_new_option);
-             'CHOOSE_PROBLEMS_HTML'
+ 	    $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
-           ];
+ 							  'Select Resource(s) to print',
-         my $helperFragment = &generate_resource_chooser(
+ 							  'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-             'CHOOSE_PROBLEMS',
+ 							  'RESOURCES',
-             'Select Problem(s) to print',
+ 							  'PAGESIZE',
-             'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+ 							  $map,
-             'RESOURCES',
+ 							  $isNotMap, '',
-             'PAGESIZE',
+ 							  $symbFilter,
-             $map,
+ 							  $start_new_option);
-             $isProblem,
-             '',
+ 	    &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
-             $symbFilter,
+ 	} else {
-             $start_new_option
+ 	    # TODO: Figure out how to tell them the folder is not printable.
-         );
+ 	}
-         $helperFragment .= &generate_resource_chooser(
-             'CHOOSE_PROBLEMS_HTML',
-             'Select Resource(s) to print',
-             'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-             'RESOURCES',
-             'PAGESIZE',
-             $map,
-             $isNotMap,
-             '',
-             $symbFilter,
-             $start_new_option
-         );
-         &Apache::lonxml::xmlparse( $r, 'helper', $helperFragment );
      }
+ 	# If the user has pfo (print for others) allow them to print all
- # If the user has pfo (print for others) allow them to print all
+ 	# problems and resources  in the entire course, optionally for selected students
- # problems and resources  in the entire course, optionally for selected students
+ 	my $post_data = $helper->{VARS}->{'postdata'};
-     my $post_data = $helper->{VARS}->{'postdata'};
-     if (
+     if ($perm{'pfo'} &&  !$is_published  &&
-            $perm{'pfo'}
+         ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
-         && !$is_published
-         && (   $post_data =~ /\/res\//
+ 	# BZ 5209 - incomplete problems from entire course:
-             || $post_data =~ /\/(syllabus|smppg|aboutme|bulletinboard)$/ )
-       )
+ 	push(@{$printChoices},
-     {
+ 	     [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
+ 	      'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
-         push @{$printChoices},
+ 	my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
-           [
-             &mtn('Selected <b>Problems</b> from <b>entire course</b>'),
+ 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
-             'all_problems', 'ALL_PROBLEMS'
-           ];
+ 	#  Selected problems/resources from entire course:
-         push @{$printChoices},
-           [
+         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
-             &mtn('Selected <b>Resources</b> from <b>entire course</b>'),
+ 	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
-             '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'];
-           ];
+ my $suffixXml = <<ALL_PROBLEMS;
-         push @{$printChoices},
-           [
-             &mtn(
- 'Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'
-             ),
-             'all_problems_students',
-             'ALL_PROBLEMS_STUDENTS'
-           ];
-         my $suffixXml = <<ALL_PROBLEMS;
    <state name="STUDENTS1" title="Select People">
        <message><b>Select sorting order of printout</b> </message>
      <choices variable='student_sort'>
- Line 3949  sub printHelper {
+ Line 4301  sub printHelper {
        <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
    </state>
  ALL_PROBLEMS
-         &Apache::lonxml::xmlparse(
+          &Apache::lonxml::xmlparse($r, 'helper',
-             $r, 'helper',
+ 				   &generate_resource_chooser('ALL_PROBLEMS',
-             &generate_resource_chooser(
+ 							      'Select Problem(s) to print',
-                 'ALL_PROBLEMS',
+ 							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
-                 'SelectProblem(s) to print',
+ 							      'RESOURCES',
- 'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+ 							      'PAGESIZE',
-                 'RESOURCES',
+ 							      '',
-                 'PAGESIZE',
+ 							      $isProblemOrMap, $isNotMap,
-                 '',
+ 							      $symbFilter,
-                 $isProblemOrMap,
+ 							      $start_new_option) .
-                 $isNotMap,
+ 				   &generate_resource_chooser('ALL_RESOURCES',
-                 $symbFilter,
+ 							      'Select Resource(s) to print',
-                 $start_new_option
+ 							      " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1'",
-               )
+ 							      'RESOURCES',
-               . &generate_resource_chooser(
+ 							      'PAGESIZE',
-                 'ALL_RESOURCES',
+ 							      '',
-                 'Select Resource(s) to print',
+ 							      $isNotMap,'',$symbFilter,
- " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1'",
+ 							      $start_new_option) .
-                 'RESOURCES',
+ 				   &generate_resource_chooser('ALL_PROBLEMS_STUDENTS',
-                 'PAGESIZE',
+ 							      'Select Problem(s) to print',
-                 '',
+ 							      'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
-                 $isNotMap,
+ 							      'RESOURCES',
-                 '',
+ 							      'STUDENTS1',
-                 $symbFilter,
+ 							      '',
-                 $start_new_option
+ 							      $isProblemOrMap,'' , $symbFilter,
-               )
+ 							      $start_new_option) .
-               . &generate_resource_chooser(
+ 				     $suffixXml
-                 'ALL_PROBLEMS_STUDENTS',
+ 				   );
-                 'Select Problem(s) to print',
- 'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+ 	if ($helper->{VARS}->{'assignment'}) {
-                 'RESOURCES',
-                 'STUDENTS1',
+ 	    # If we were looking at a page, allow a selection of problems from the page
-                 '',
+ 	    # either for selected students or for coded assignments.
-                 $isProblemOrMap,
-                 '',
+ 	    if ($page_ispage) {
-                 $symbFilter,
+ 		push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',
-                 $start_new_option
+ 					    '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
-               )
+ 					'problems_for_students_from_page', 'CHOOSE_TGT_STUDENTS_PAGE'];
-               . $suffixXml
+ 		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'];
-         if ( $helper->{VARS}->{'assignment'} ) {
+ 	    }
+ 	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',
-      # If we were looking at a page, allow a selection of problems from the page
+ 					'<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),
-      # either for selected students or for coded assignments.
+ 				    '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'];
+ 	}
-             if ($page_ispage) {
+ 	my $randomly_ordered_warning =
-                 push @{$printChoices},
+             &get_randomly_ordered_warning($helper, $map);
-                   [
-                     &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 =
+ 	# resource_selector will hold a few states that:
-           &get_randomly_ordered_warning( $helper, $map );
+ 	#   - Allow resources to be selected for printing.
+ 	#   - Determine pagination between assignments.
+ 	#   - Determine how many assignments should be bundled into a single PDF.
+         # TODO:
+ 	#    Probably good to do things like separate this up into several vars, each
+ 	#    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= &generate_resource_chooser('SELECT_PROBLEMS',
+ 							  'Select resources to print',
+ 							  'multichoice="1" addstatus="1" closeallpages="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'",
+ 							'RESOURCES',
+ 							'PRINT_FORMATTING',
+ 							$url,
+ 							$isProblem, '',  $symbFilter,
+ 							$start_new_option);
+ # Generate student choosers.
-    # resource_selector will hold a few states that:
-    #   - Allow resources to be selected for printing.
-    #   - Determine pagination between assignments.
-    #   - Determine how many assignments should be bundled into a single PDF.
-    # TODO:
-    #    Probably good to do things like separate this up into several vars, each
-    #    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 = &generate_resource_chooser(
-             'SELECT_PROBLEMS',
-             'Select resources to print',
-             'multichoice="1" addstatus="1" closeallpages="1"',
-             'RESOURCES',
-             'PRINT_FORMATTING',
-             $map,
-             $isProblem,
-             '',
-             $symbFilter,
-             $start_new_option
-         );
-         $resource_selector .= <<RESOURCE_SELECTOR;
-     <state name="PRINT_FORMATTING" title="How should results be printed?">
-     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
-     <choices variable="EMPTY_PAGES">
-       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
-       <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
-       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
-       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-     </choices>
-     <nextstate>PAGESIZE</nextstate>
-     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
-     <choices variable="SPLIT_PDFS">
-        <choice computer="all">All assignments in a single PDF file</choice>
-        <choice computer="sections">Each PDF contains exactly one section</choice>
-        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-        <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
-             Specify the number of assignments per PDF:</choice>
-     </choices>
-     </state>
- RESOURCE_SELECTOR
-         $resource_selector .= &generate_resource_chooser(
-             'CHOOSE_STUDENTS_PAGE',
-             'Select Problem(s) to print',
-             "multichoice='1' addstatus='1' closeallpages ='1'",
-             'RESOURCES',
-             'PRINT_FORMATTING',
-             $url,
-             $isProblem,
-             '',
-             $symbFilter,
-             $start_new_option
-         );
-         # Generate student choosers.
-         &Apache::lonxml::xmlparse(
+         &Apache::lonxml::xmlparse($r, 'helper',
-             $r, 'helper',
+ 				  &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',
-             &generate_student_chooser(
+ 							    'student_sort',
-                 'CHOOSE_TGT_STUDENTS_PAGE', 'student_sort',
+ 							    'STUDENTS',
-                 'STUDENTS',                 'CHOOSE_STUDENTS_PAGE'
+ 							    'CHOOSE_STUDENTS_PAGE'));
-             )
+ 	&Apache::lonxml::xmlparse($r, 'helper',
-         );
+ 				  &generate_student_chooser('CHOOSE_STUDENTS',
-         &Apache::lonxml::xmlparse(
+ 							    'student_sort',
-             $r, 'helper',
+ 							    'STUDENTS',
-             &generate_student_chooser(
+ 							    'SELECT_PROBLEMS'));
-                 'CHOOSE_STUDENTS', 'student_sort',
+ 	&Apache::lonxml::xmlparse($r, 'helper', $resource_selector);
-                 'STUDENTS',        'SELECT_PROBLEMS'
-             )
+ 	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-         );
+ 	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-         &Apache::lonxml::xmlparse( $r, 'helper', $resource_selector );
+         my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
+ 	my $namechoice='<choice></choice>';
+ 	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
+ 	    if ($name =~ /^error: 2 /) { next; }
+ 	    if ($name =~ /^type\0/) { next; }
+ 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
+ 	}
-         my $cdom  = $env{ 'course.' . $env{'request.course.id'} . '.domain' };
-         my $cnum  = $env{ 'course.' . $env{'request.course.id'} . '.num' };
-         my @names = &Apache::lonnet::getkeys( 'CODEs', $cdom, $cnum );
-         my $namechoice = '<choice></choice>';
-         foreach my $name ( sort { uc($a) cmp uc($b) } @names ) {
-             if ( $name =~ /^error: 2 / ) { next; }
-             if ( $name =~ /^type\0/ )    { next; }
-             $namechoice .=
-               '<choice computer="' . $name . '">' . $name . '</choice>';
-         }
-         my %code_values;
+ 	my %code_values;
-         my %codes_to_print;
+ 	my %codes_to_print;
-         foreach my $key (@names) {
+ 	foreach my $key (@names) {
-             %code_values = &Apache::grades::get_codes( $key, $cdom, $cnum );
+ 	    %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);
-             foreach my $key ( keys(%code_values) ) {
+ 	    foreach my $key (keys(%code_values)) {
-                 $codes_to_print{$key} = 1;
+ 		$codes_to_print{$key} = 1;
-             }
+ 	    }
-         }
+ 	}
-         my $code_selection;
+ 	my $code_selection;
-         foreach
+ 	foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
-           my $code ( sort { uc($a) cmp uc($b) } ( keys(%codes_to_print) ) )
+ 	    my $choice  = $code;
-         {
+ 	    if ($code =~ /^[A-Z]+$/) { # Alpha code
-             my $choice = $code;
+ 		$choice = &letters_to_num($code);
-             if ( $code =~ /^[A-Z]+$/ ) {    # Alpha code
+ 	    }
-                 $choice = &letters_to_num($code);
+ 	    push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
-             }
+ 	}
-             push( @{ $helper->{DATA}{ALL_CODE_CHOICES} }, [ $code, $choice ] );
+ 	if (%codes_to_print) {
-         }
+ 	    $code_selection .='
-         if (%codes_to_print) {
-             $code_selection .= '
  	    <message><b>Choose single CODE from list:</b></message>
  		<message></td><td></message>
  		<dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
- Line 4167  RESOURCE_SELECTOR
+ Line 4439  RESOURCE_SELECTOR
                    </exec>
  		</dropdown>
  	    <message></td></tr><tr><td></message>
-             ' . $/;
+             '.$/;
-         }
+ 	}
-         my @lines      = &Apache::grades::get_scantronformat_file();
+         my @lines = &Apache::grades::get_scantronformat_file();
-         my $codechoice = '';
+ 	my $codechoice='';
-         foreach my $line (@lines) {
+ 	foreach my $line (@lines) {
-             my ( $name, $description, $code_type, $code_length ) =
+             next if (($line =~ /^\#/) || ($line eq ''));
-               ( split( /:/, $line ) )[ 0, 1, 2, 4 ];
+ 	    my ($name,$description,$code_type,$code_length)=
-             if (   $code_length > 0
+ 		(split(/:/,$line))[0,1,2,4];
-                 && $code_type =~ /^(letter|number|-1)/ )
+ 	    if ($code_length > 0 &&
-             {
+ 		$code_type =~/^(letter|number|-1)/) {
-                 $codechoice .=
+ 		$codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';
-                     '<choice computer="'
+ 	    }
-                   . $name . '">'
+ 	}
-                   . $description
+ 	if ($codechoice eq '') {
-                   . '</choice>';
+ 	    $codechoice='<choice computer="default">Default</choice>';
-             }
+ 	}
-         }
+ 	my $anon1 = &generate_code_selector($helper,
-         if ( $codechoice eq '' ) {
+ 					    'CHOOSE_ANON1',
-             $codechoice = '<choice computer="default">Default</choice>';
+ 					    'SELECT_PROBLEMS',
-         }
+ 					    $codechoice,
-         my $anon1 =
+ 					    $code_selection,
-           &generate_code_selector( $helper, 'CHOOSE_ANON1', 'SELECT_PROBLEMS',
+ 					    $namechoice) . $resource_selector;
-             $codechoice, $code_selection, $namechoice )
-           . $resource_selector;
+         &Apache::lonxml::xmlparse($r, 'helper',$anon1);
-         &Apache::lonxml::xmlparse( $r, 'helper', $anon1 );
+ 	my $anon_page = &generate_code_selector($helper,
-         my $anon_page =
+ 						'CHOOSE_ANON1_PAGE',
-           &generate_code_selector( $helper, 'CHOOSE_ANON1_PAGE',
+ 						'SELECT_PROBLEMS_PAGE',
-             'SELECT_PROBLEMS_PAGE', $codechoice, $code_selection, $namechoice )
+ 						$codechoice,
-           . &generate_resource_chooser(
+ 						$code_selection,
-             'SELECT_PROBLEMS_PAGE',
+ 						$namechoice) .
-             'Select Problem(s) to print',
+ 			&generate_resource_chooser('SELECT_PROBLEMS_PAGE',
-             "multichoice='1' addstatus='1' closeallpages ='1'",
+ 						   'Select Problem(s) to print',
-             'RESOURCES',
+ 						   "multichoice='1' addstatus='1' closeallpages ='1'",
-             'PRINT_FORMATTING',
+ 						   'RESOURCES',
-             $url,
+ 						   'PRINT_FORMATTING',
-             $isProblem,
+ 						   $url,
-             '',
+ 						   $isProblem, '',  $symbFilter,
-             $symbFilter,
+ 						   $start_new_option);
-             $start_new_option
+ 	&Apache::lonxml::xmlparse($r, 'helper', $anon_page);
-           );
-         &Apache::lonxml::xmlparse( $r, 'helper', $anon_page );
+ 	if ($helper->{VARS}->{'assignment'}) {
-         if ( $helper->{VARS}->{'assignment'} ) {
-             push @{$printChoices},
+ 	    # Assignment printing:
-               [
-                 &mt(
+ 	    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'];
- 'Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]',
+ 	    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'];
-                     '<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;
+ 	$resource_selector=<<RESOURCE_SELECTOR;
      <state name="SELECT_RESOURCES" title="Select Resources">
      $randomly_ordered_warning
      <nextstate>PRINT_FORMATTING</nextstate>
- Line 4255  RESOURCE_SELECTOR
+ Line 4506  RESOURCE_SELECTOR
        $start_new_option
        </resource>
      </state>
-     <state name="PRINT_FORMATTING" title="Format of the print job">
-     <nextstate>NUMBER_PER_PDF</nextstate>
-     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
-     <choices variable="EMPTY_PAGES">
-       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
-       <choice computer='1'>Add one empty page/column after each student\'s assignment</choice>
-       <choice computer='2'>Add two empty pages/column after each student\'s assignment</choice>
-       <choice computer='3'>Add three empty pages/column after each student\'s assignment</choice>
-     </choices>
-     <nextstate>PAGESIZE</nextstate>
-     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
-     <choices variable="SPLIT_PDFS">
-        <choice computer="all">All assignments in a single PDF file</choice>
-        <choice computer="sections">Each PDF contains exactly one section</choice>
-        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
-        <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
-            Specify the number of assignments per PDF:</choice>
-     </choices>
-     </state>
  RESOURCE_SELECTOR
-         &Apache::lonxml::xmlparse( $r, 'helper', <<CHOOSE_STUDENTS1);
+         $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'>
        <choice computer='0'>Sort by section then student</choice>
- Line 4290  RESOURCE_SELECTOR
+ Line 4524  RESOURCE_SELECTOR
      $resource_selector
  CHOOSE_STUDENTS1
-         &Apache::lonxml::xmlparse( $r, 'helper', <<CHOOSE_ANON2);
+ 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
    <state name="CHOOSE_ANON2" title="Select CODEd Assignments">
      <nextstate>SELECT_RESOURCES</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">
+     <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 4305  CHOOSE_STUDENTS1
+ Line 4539  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 4313  CHOOSE_STUDENTS1
+ Line 4551  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 4328  CHOOSE_STUDENTS1
+ Line 4566  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 4349  CHOOSE_ANON2
+ Line 4589  CHOOSE_ANON2
      }
      # FIXME: That RE should come from a library somewhere.
-     if (
+     if (($perm{'pav'}
-         (
+ 	&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
-                $perm{'pav'}
+ 	&& (defined($helper->{'VARS'}->{'construction'})
-             && $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}
+ 	    ||
-             . '/res/'
+ 	    (&Apache::lonnet::allowed('bre',$subdir) eq 'F'
-             && (
+ 	     &&
-                 defined( $helper->{'VARS'}->{'construction'} )
+ 	     $helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
-                 || (   &Apache::lonnet::allowed( 'bre', $subdir ) eq 'F'
+ 	    ))
-                     && $helper->{VARS}->{'postdata'} =~
+ 	&& $helper->{VARS}->{'assignment'} eq ""
- /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/
+ 	) {
-                 )
+ 	my $pretty_dir = &Apache::lonnet::hreflocation($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'];
-         )
-         && $helper->{VARS}->{'assignment'} eq ""
-       )
-     {
-         my $pretty_dir = &Apache::lonnet::hreflocation($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 4386  CHOOSE_ANON2
+ Line 4608  CHOOSE_ANON2
        <nextstate>PAGESIZE</nextstate>
        <filechoice>return '$subdir';</filechoice>
  CHOOSE_FROM_SUBDIR
          # this is broken up because I really want interpolation above,
          # and I really DON'T want it below
          $xmlfrag .= <<'CHOOSE_FROM_SUBDIR';
- Line 4396  CHOOSE_FROM_SUBDIR
+ Line 4618  CHOOSE_FROM_SUBDIR
        </files>
      </state>
  CHOOSE_FROM_SUBDIR
-         &Apache::lonxml::xmlparse( $r, 'helper', $xmlfrag );
+         &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
      }
      # Allow the user to select any sequence in the course, feed it to
      # another resource selector for that sequence
-     if ( !$helper->{VARS}->{'construction'} && !$is_published ) {
+     if (!$helper->{VARS}->{'construction'} && !$is_published) {
-         push @$printChoices,
+ 	push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
-           [
+ 			      'select_sequences', 'CHOOSE_SEQUENCE'];
-             &mtn(
+ 	my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
- "Selected <b>Resources</b> from <b>selected folder</b> in course"
+ 	#Escape apostrophes and backslashes for Perl
-             ),
+ 	$escapedSequenceName =~ s/\\/\\\\/g;
-             'select_sequences',
+ 	$escapedSequenceName =~ s/'/\\'/g;
-             'CHOOSE_SEQUENCE'
+ 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
-           ];
-         my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
-         #Escape apostrophes and backslashes for Perl
-         $escapedSequenceName =~ s/\\/\\\\/g;
-         $escapedSequenceName =~ s/'/\\'/g;
-         &Apache::lonxml::xmlparse( $r, 'helper', <<CHOOSE_FROM_ANY_SEQUENCE);
    <state name="CHOOSE_SEQUENCE" title="Select Sequence To Print From">
      <message>Select the sequence to print resources from:</message>
      <resource variable="SEQUENCE">
        <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 4438  CHOOSE_FROM_SUBDIR
+ Line 4653  CHOOSE_FROM_SUBDIR
        </resource>
      </state>
  CHOOSE_FROM_ANY_SEQUENCE
-     }
+ }
      # Generate the first state, to select which resources get printed.
-     Apache::lonhelper::state->new( "START", "Select Printing Options:" );
+     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();
-     $paramHash               = Apache::lonhelper::getParamHash();
+     $paramHash = Apache::lonhelper::getParamHash();
      $paramHash->{'variable'} = 'PRINT_TYPE';
-     $paramHash->{CHOICES}    = $printChoices;
+     $paramHash->{CHOICES} = $printChoices;
      Apache::lonhelper::choices->new();
-     my $startedTable = 0;    # have we started an HTML table yet? (need
+     my $startedTable = 0; # have we started an HTML table yet? (need
-                              # to close it later)
+                           # to close it later)
-     if (
+     if (($perm{'pav'} and $perm{'vgr'}) or
-         (
+ 	($helper->{VARS}->{'construction'} eq '1')) {
-                 $perm{'pav'}
+ 	&addMessage('<br />'
-             and &Apache::lonnet::allowed( 'vgr', $env{'request.course.id'} )
+                    .'<h3>'.&mt('Print Options').'</h3>'
-         )
+                    .&Apache::lonhtmlcommon::start_pick_box()
-         or ( $helper->{VARS}->{'construction'} eq '1' )
+                    .&Apache::lonhtmlcommon::row_title(
-       )
+                        '<label for="ANSWER_TYPE_forminput">'
-     {
+                       .&mt('Print Answers')
-         &addMessage(
+                       .'</label>'
-                 '<br />' . '<h3>'
+                     )
-               . &mt('Print Options') . '</h3>'
-               . &Apache::lonhtmlcommon::start_pick_box()
-               . &Apache::lonhtmlcommon::row_title(
-                     '<label for="ANSWER_TYPE_forminput">'
-                   . &mt('Print Answers')
-                   . '</label>'
-               )
          );
          $paramHash = Apache::lonhelper::getParamHash();
-         $paramHash->{'variable'} = 'ANSWER_TYPE';
+ 	$paramHash->{'variable'} = 'ANSWER_TYPE';
-         $helper->declareVar('ANSWER_TYPE');
+ 	$helper->declareVar('ANSWER_TYPE');
          $paramHash->{CHOICES} = [
-             [ 'Without Answers', 'yes' ],
+                                    ['Without Answers', 'yes'],
-             [ 'With Answers',    'no' ],
+                                    ['With Answers', 'no'],
-             [ 'Only Answers',    'only' ]
+                                    ['Only Answers', 'only']
-         ];
+                                 ];
          Apache::lonhelper::dropdown->new();
-         &addMessage( &Apache::lonhtmlcommon::row_closure() );
+ 	&addMessage(&Apache::lonhtmlcommon::row_closure());
-         $startedTable = 1;
+ 	$startedTable = 1;
+ #
+ #  Select font size.
+ #
-         #
+             $helper->declareVar('fontsize');
-         #  Select font size.
+             &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Font Size')));
-         #
+             my $xmlfrag = << "FONT_SELECTION";
-         $helper->declareVar('fontsize');
-         &addMessage( &Apache::lonhtmlcommon::row_title( &mt('Font Size') ) );
-         my $xmlfrag = << "FONT_SELECTION";
              <dropdown variable='fontsize' multichoice='0', allowempty='0'>
- Line 4508  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4746  CHOOSE_FROM_ANY_SEQUENCE
              <choice computer='Huge'>Largest possible size</choice>
              </dropdown>
  FONT_SELECTION
-         &Apache::lonxml::xmlparse( $r, 'helper', $xmlfrag );
+             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-         &addMessage( &Apache::lonhtmlcommon::row_closure(1) );
+             &addMessage(&Apache::lonhtmlcommon::row_closure(1));
      }
-     if ( $perm{'pav'} ) {
+     if ($perm{'pav'}) {
-         if ( !$startedTable ) {
+ 	if (!$startedTable) {
-             addMessage( "<hr width='33%' /><table><tr><td align='right'>"
+ 	    addMessage("<hr width='33%' /><table><tr><td align='right'>".
-                   . '<label for="LATEX_TYPE_forminput">'
+                        '<label for="LATEX_TYPE_forminput">'.
-                   . &mt('LaTeX mode')
+                        &mt('LaTeX mode').
-                   . "</label>: </td><td>" );
+                        "</label>: </td><td>");
-             $startedTable = 1;
+ 	    $startedTable = 1;
-         }
+ 	} else {
-         else {
+ 	    &addMessage(&Apache::lonhtmlcommon::row_title(
-             &addMessage(
+                            '<label for="LATEX_TYPE_forminput">'
-                 &Apache::lonhtmlcommon::row_title(
+                            .&mt('LaTeX mode')
-                         '<label for="LATEX_TYPE_forminput">'
+                            .'</label>'
-                       . &mt('LaTeX mode')
+                         )
-                       . '</label>'
-                 )
              );
-         }
+ 	}
          $paramHash = Apache::lonhelper::getParamHash();
-         $paramHash->{'variable'} = 'LATEX_TYPE';
+ 	$paramHash->{'variable'} = 'LATEX_TYPE';
-         $helper->declareVar('LATEX_TYPE');
+ 	$helper->declareVar('LATEX_TYPE');
-         if ( $helper->{VARS}->{'construction'} eq '1' ) {
+ 	if ($helper->{VARS}->{'construction'} eq '1') {
-             $paramHash->{CHOICES} = [
+ 	    $paramHash->{CHOICES} = [
-                 [ 'standard LaTeX mode', 'standard' ],
+ 				     ['standard LaTeX mode', 'standard'],
-                 [ 'LaTeX batchmode',     'batchmode' ],
+ 				     ['LaTeX batchmode', 'batchmode'], ];
-             ];
+ 	} else {
-         }
+ 	    $paramHash->{CHOICES} = [
-         else {
+ 				     ['LaTeX batchmode', 'batchmode'],
-             $paramHash->{CHOICES} = [
+ 				     ['standard LaTeX mode', 'standard'] ];
-                 [ 'LaTeX batchmode',     'batchmode' ],
+ 	}
-                 [ 'standard LaTeX mode', 'standard' ]
-             ];
-         }
          Apache::lonhelper::dropdown->new();
-         &addMessage(
+ 	&addMessage(&Apache::lonhtmlcommon::row_closure()
-             &Apache::lonhtmlcommon::row_closure()
+                    .&Apache::lonhtmlcommon::row_title(
-               . &Apache::lonhtmlcommon::row_title(
+                         '<label for="TABLE_CONTENTS_forminput">'
-                     '<label for="TABLE_CONTENTS_forminput">'
+                        .&mt('Print Table of Contents')
-                   . &mt('Print Table of Contents')
+                        .'</label>'
-                   . '</label>'
+                     )
-               )
          );
          $paramHash = Apache::lonhelper::getParamHash();
-         $paramHash->{'variable'} = 'TABLE_CONTENTS';
+ 	$paramHash->{'variable'} = 'TABLE_CONTENTS';
-         $helper->declareVar('TABLE_CONTENTS');
+ 	$helper->declareVar('TABLE_CONTENTS');
-         $paramHash->{CHOICES} = [ [ 'No', 'no' ], [ 'Yes', 'yes' ] ];
+         $paramHash->{CHOICES} = [
+                                    ['No', 'no'],
+                                    ['Yes', 'yes'] ];
          Apache::lonhelper::dropdown->new();
-         &addMessage( &Apache::lonhtmlcommon::row_closure() );
+ 	&addMessage(&Apache::lonhtmlcommon::row_closure());
-         if ( not $helper->{VARS}->{'construction'} ) {
+ 	if (not $helper->{VARS}->{'construction'}) {
-             &addMessage(
+ 	    &addMessage(&Apache::lonhtmlcommon::row_title(
-                 &Apache::lonhtmlcommon::row_title(
+                             '<label for="TABLE_INDEX_forminput">'
-                         '<label for="TABLE_INDEX_forminput">'
+                            .&mt('Print Index')
-                       . &mt('Print Index')
+                            .'</label>'
-                       . '</label>'
+                         )
-                 )
              );
-             $paramHash = Apache::lonhelper::getParamHash();
+ 	    $paramHash = Apache::lonhelper::getParamHash();
-             $paramHash->{'variable'} = 'TABLE_INDEX';
+ 	    $paramHash->{'variable'} = 'TABLE_INDEX';
-             $helper->declareVar('TABLE_INDEX');
+ 	    $helper->declareVar('TABLE_INDEX');
-             $paramHash->{CHOICES} = [ [ 'No', 'no' ], [ 'Yes', 'yes' ] ];
+ 	    $paramHash->{CHOICES} = [
-             Apache::lonhelper::dropdown->new();
+ 				     ['No', 'no'],
-             &addMessage( &Apache::lonhtmlcommon::row_closure() );
+ 				     ['Yes', 'yes'] ];
-             &addMessage(
+ 	    Apache::lonhelper::dropdown->new();
-                 &Apache::lonhtmlcommon::row_title(
+             &addMessage(&Apache::lonhtmlcommon::row_closure());
-                         '<label for="PRINT_DISCUSSIONS_forminput">'
+             &addMessage(&Apache::lonhtmlcommon::row_title(
-                       . &mt('Print Discussions')
+                             '<label for="PRINT_DISCUSSIONS_forminput">'
-                       . '</label>'
+                            .&mt('Print Discussions')
-                 )
+                            .'</label>'
+                         )
              );
-             $paramHash = Apache::lonhelper::getParamHash();
+ 	    $paramHash = Apache::lonhelper::getParamHash();
-             $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';
+ 	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';
-             $helper->declareVar('PRINT_DISCUSSIONS');
+ 	    $helper->declareVar('PRINT_DISCUSSIONS');
-             $paramHash->{CHOICES} = [ [ 'No', 'no' ], [ 'Yes', 'yes' ] ];
+ 	    $paramHash->{CHOICES} = [
-             Apache::lonhelper::dropdown->new();
+ 				     ['No', 'no'],
-             &addMessage( &Apache::lonhtmlcommon::row_closure() );
+ 				     ['Yes', 'yes'] ];
+ 	    Apache::lonhelper::dropdown->new();
-             # Prompt for printing annotations too.
+             &addMessage(&Apache::lonhtmlcommon::row_closure());
-             &addMessage(
+ 	    # Prompt for printing annotations too.
-                 &Apache::lonhtmlcommon::row_title(
-                         '<label for="PRINT_ANNOTATIONS_forminput">'
+ 	    &addMessage(&Apache::lonhtmlcommon::row_title(
-                       . &mt('Print Annotations')
+                             '<label for="PRINT_ANNOTATIONS_forminput">'
-                       . '</label>'
+                            .&mt('Print Annotations')
-                 )
+                            .'</label>'
+                         )
              );
-             $paramHash = Apache::lonhelper::getParamHash();
+ 	    $paramHash = Apache::lonhelper::getParamHash();
-             $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
+ 	    $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
-             $helper->declareVar("PRINT_ANNOTATIONS");
+ 	    $helper->declareVar("PRINT_ANNOTATIONS");
-             $paramHash->{CHOICES} = [ [ 'No', 'no' ], [ 'Yes', 'yes' ] ];
+ 	    $paramHash->{CHOICES} = [
-             Apache::lonhelper::dropdown->new();
+ 				     ['No', 'no'],
-             &addMessage( &Apache::lonhtmlcommon::row_closure() );
+ 				     ['Yes', 'yes']];
+ 	    Apache::lonhelper::dropdown->new();
-             &addMessage( &Apache::lonhtmlcommon::row_title( &mt('Foils') ) );
+             &addMessage(&Apache::lonhtmlcommon::row_closure());
-             $paramHash                  = Apache::lonhelper::getParamHash();
-             $paramHash->{'multichoice'} = "true";
+             &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Foils')));
-             $paramHash->{'allowempty'}  = "true";
+ 	    $paramHash = Apache::lonhelper::getParamHash();
-             $paramHash->{'variable'}    = "showallfoils";
+ 	    $paramHash->{'multichoice'} = "true";
-             $paramHash->{'CHOICES'} = [ [ &mt('Show All Foils'), "1" ] ];
+ 	    $paramHash->{'allowempty'}  = "true";
-             Apache::lonhelper::choices->new();
+ 	    $paramHash->{'variable'}   = "showallfoils";
-             &addMessage( &Apache::lonhtmlcommon::row_closure(1) );
+ 	    $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ];
-         }
+ 	    Apache::lonhelper::choices->new();
+             &addMessage(&Apache::lonhtmlcommon::row_closure(1));
+ 	}
-         if ( $helper->{'VARS'}->{'construction'} ) {
+ 	if ($helper->{'VARS'}->{'construction'}) {
-             my $stylevalue     = '$Apache::lonnet::env{"construct.style"}';
+ 	    my $stylevalue='$Apache::lonnet::env{"construct.style"}';
-             my $randseedtext   = &mt("Use random seed");
+             my $randseedtext=&mt("Use random seed");
-             my $stylefiletext  = &mt("Use style file");
+             my $stylefiletext=&mt("Use style file");
-             my $selectfiletext = &mt("Select style file");
+             my $selectfiletext=&mt("Select style file");
-             my $xmlfrag .=
+ 	    my $xmlfrag .= '<message>'
-               '<message>'
+             .&Apache::lonhtmlcommon::row_title('<label for="curseed_forminput">'
-               . &Apache::lonhtmlcommon::row_title(
+                                               .$randseedtext
-                 '<label for="curseed_forminput">' . $randseedtext . '</label>' )
+                                               .'</label>'
-               . '</message>
+              )
+             .'</message>
              <string variable="curseed" size="15" maxlength="15">
                  <defaultvalue>
-                    return ' . $helper->{VARS}->{'curseed'} . ';
+                    return '.$helper->{VARS}->{'curseed'}.';
                  </defaultvalue>'
-               . '</string>'
+             .'</string>'
-               . '<message>'
+             .'<message>'
-               . &Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_closure()
-               . &Apache::lonhtmlcommon::row_title(
+             .&Apache::lonhtmlcommon::row_title('<label for="style_file">'
-                 '<label for="style_file">' . $stylefiletext . '</label>' )
+                                               .$stylefiletext
-               . '</message>
+                                               .'</label>'
+              )
+             .'</message>
               <string variable="style_file" size="40">
                  <defaultvalue>
-                     return ' . $stylevalue . ';
+                     return '.$stylevalue.';
                  </defaultvalue>
               </string><message>&nbsp;'
-               . qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
+ .qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
-               . $selectfiletext . '</a>'
+ .$selectfiletext.'</a>'
-               . &Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_closure()
-               . &Apache::lonhtmlcommon::row_title( &mt('Show All Foils') )
+             .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils'))
-               . '</message>
+             .'</message>
  	     <choices allowempty="1" multichoice="true" variable="showallfoils">
                  <choice computer="1">&nbsp;</choice>
               </choices>'
-               . '<message>'
+ 	    .'<message>'
-               . &Apache::lonhtmlcommon::row_closure()
+             .&Apache::lonhtmlcommon::row_closure()
-               . '</message>';
+             .'</message>';
-             &Apache::lonxml::xmlparse( $r, 'helper', $xmlfrag );
+             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-             &addMessage(
-                 &Apache::lonhtmlcommon::row_title( &mt('Problem Type') ) );
+             &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Problem Type')));
+ 	    #
-             #
+ 	    # Initial value from construction space:
-             # Initial value from construction space:
+ 	    #
-             #
+ 	    if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
-             if ( !$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'} )
+ 		$helper->{VARS}->{'probstatus'} = $env{'form.problemtype'};	# initial value
-             {
+ 	    }
-                 $helper->{VARS}->{'probstatus'} =
+ 	    $xmlfrag = << "PROBTYPE";
-                   $env{'form.problemtype'};    # initial value
-             }
-             $xmlfrag = << "PROBTYPE";
  		<dropdown variable="probstatus" multichoice="0" allowempty="0">
  		   <defaultvalue>
  		      return "$helper->{VARS}->{'probstatus'}";
                     </defaultvalue>
  		   <choice computer="problem">Homework Problem</choice>
- 		   <choice computer="exam">Exam Problem</choice>
+ 		   <choice computer="exam">Bubblesheet Exam Problem</choice>
  		   <choice computer="survey">Survey question</choice>
                     ,choice computer="anonsurvey"Anonymous survey question</choice>
  		</dropdown>
  PROBTYPE
-             &Apache::lonxml::xmlparse( $r, 'helper', $xmlfrag );
+             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-             &addMessage( &Apache::lonhtmlcommon::row_closure(1) );
+             &addMessage(&Apache::lonhtmlcommon::row_closure(1));
          }
      }
      if ($startedTable) {
-         &addMessage( &Apache::lonhtmlcommon::end_pick_box() );
+         &addMessage(&Apache::lonhtmlcommon::end_pick_box());
      }
      Apache::lonprintout::page_format_state->new("FORMAT");
      # Generate the PAGESIZE state which will offer the user the margin
      # choices if they select one column
-     Apache::lonhelper::state->new( "PAGESIZE", "Set Margins" );
+     Apache::lonhelper::state->new("PAGESIZE", "Set Margins");
-     Apache::lonprintout::page_size_state->new( 'pagesize', 'FORMAT', 'FINAL' );
+     Apache::lonprintout::page_size_state->new('pagesize', 'FORMAT', 'FINAL');
      $helper->process();
      # MANUAL BAILOUT CONDITION:
      # If we're in the "final" state, bailout and return to handler
-     if ( $helper->{STATE} eq 'FINAL' ) {
+     if ($helper->{STATE} eq 'FINAL') {
          return $helper;
      }
-     $r->print( $helper->display() );
+     my $footer;
-     if ( $helper->{STATE} eq 'START' ) {
+     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;
  }
 ;
  package Apache::lonprintout::page_format_state;
- Line 4746  use Apache::lonlocal;
+ Line 4993  use Apache::lonlocal;
  use Apache::lonnet;
  my $maxColumns = 2;
  # it'd be nice if these all worked
  #my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
  #                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
  #                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]",
  #                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
- my @paperSize =
+ my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
-   ( "letter [8 1/2x11 in]", "legal [8 1/2x14 in]", "a4 [210x297 mm]" );
+ 		 "a4 [210x297 mm]");
  # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
  #                   Paper type
  sub new {
      my $self = Apache::lonhelper::element->new();
      shift;
      $self->{'variable'} = shift;
      my $helper = Apache::lonhelper::getHelper();
-     $helper->declareVar( $self->{'variable'} );
+     $helper->declareVar($self->{'variable'});
      bless($self);
      return $self;
  }
  sub render {
-     my $self            = shift;
+     my $self = shift;
-     my $helper          = Apache::lonhelper::getHelper();
+     my $helper = Apache::lonhelper::getHelper();
-     my $result          = '';
+     my $result = '';
-     my $var             = $self->{'variable'};
+     my $var = $self->{'variable'};
-     my $PageLayout      = &mt('Page layout');
+     my $PageLayout=&mt('Page layout');
-     my $NumberOfColumns = &mt('Number of columns');
+     my $NumberOfColumns=&mt('Number of columns');
-     my $PaperType       = &mt('Paper type');
+     my $PaperType=&mt('Paper type');
-     my $landscape       = &mt('Landscape');
+     my $landscape=&mt('Landscape');
-     my $portrait        = &mt('Portrait');
+     my $portrait=&mt('Portrait');
-     my $pdfFormLabel    = &mt('PDF-Formfields');
+     my $pdfFormLabel=&mt('PDF Form Fields');
-     my $with            = &mt('with Formfields');
+     my $with=&mt('with Form Fields');
-     my $without         = &mt('without Formfields');
+     my $without=&mt('without Form Fields');
-     $result .= '<h3>'
-       . &mt('Layout Options') . '</h3>'
+     $result.='<h3>'.&mt('Layout Options').'</h3>'
-       . &Apache::loncommon::start_data_table()
+             .&Apache::loncommon::start_data_table()
-       . &Apache::loncommon::start_data_table_header_row() . '<th>'
+             .&Apache::loncommon::start_data_table_header_row()
-       . $PageLayout . '</th>' . '<th>'
+             .'<th>'.$PageLayout.'</th>'
-       . $NumberOfColumns . '</th>' . '<th>'
+             .'<th>'.$NumberOfColumns.'</th>'
-       . $PaperType . '</th>' . '<th>'
+             .'<th>'.$PaperType.'</th>'
-       . $pdfFormLabel . '</th>'
+             .'<th>'.$pdfFormLabel.'</th>'
-       . &Apache::loncommon::end_data_table_header_row()
+             .&Apache::loncommon::end_data_table_header_row()
-       . &Apache::loncommon::start_data_table_row() . '<td>'
+             .&Apache::loncommon::start_data_table_row()
-       . '<label><input type="radio" name="'
+     .'<td>'
-       . ${var}
+     .'<label><input type="radio" name="'.${var}.'.layout" value="L" />'.$landscape.'</label><br />'
-       . '.layout" value="L" />'
+     .'<label><input type="radio" name="'.${var}.'.layout" value="P" checked="checked" />'.$portrait.'</label>'
-       . $landscape
+     .'</td>';
-       . '</label><br />'
-       . '<label><input type="radio" name="'
-       . ${var}
-       . '.layout" value="P" checked="checked" />'
-       . $portrait
-       . '</label>' . '</td>';
-     $result .= '<td align="center">' . '<select name="' . ${var} . '.cols">';
+     $result.='<td align="center">'
+             .'<select name="'.${var}.'.cols">';
      my $i;
-     for ( $i = 1 ; $i <= $maxColumns ; $i++ ) {
+     for ($i = 1; $i <= $maxColumns; $i++) {
-         if ( $i == 2 ) {
+         if ($i == 2) {
-             $result .=
+             $result .= '<option value="'.$i.'" selected="selected">'.$i.'</option>'."\n";
-                 '<option value="'
+         } else {
-               . $i
+             $result .= '<option value="'.$i.'">'.$i.'</option>'."\n";
-               . '" selected="selected">'
-               . $i
-               . '</option>' . "\n";
-         }
-         else {
-             $result .= '<option value="' . $i . '">' . $i . '</option>' . "\n";
          }
      }
      $result .= "</select></td><td>\n";
      $result .= "<select name='${var}.paper'>\n";
-     my %parmhash =
+     my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
-       &Apache::lonnet::coursedescription( $env{'request.course.id'} );
+     my $DefaultPaperSize=lc($parmhash{'default_paper_size'});
-     my $DefaultPaperSize = lc( $parmhash{'default_paper_size'} );
+     $DefaultPaperSize=~s/\s//g;
-     $DefaultPaperSize =~ s/\s//g;
+     if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
-     if ( $DefaultPaperSize eq '' ) { $DefaultPaperSize = 'letter'; }
      $i = 0;
      foreach (@paperSize) {
-         $_ =~ /(\w+)/;
+ 	$_=~/(\w+)/;
-         my $papersize = $1;
+ 	my $papersize=$1;
-         if ( $paperSize[$i] =~ /$DefaultPaperSize/ ) {
+         if ($paperSize[$i]=~/$DefaultPaperSize/) {
-             $result .=
+             $result .= '<option selected="selected" value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
-                 '<option selected="selected" value="'
+         } else {
-               . $papersize . '">'
+             $result .= '<option value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
-               . $paperSize[$i]
-               . '</option>' . "\n";
-         }
-         else {
-             $result .=
-                 '<option value="'
-               . $papersize . '">'
-               . $paperSize[$i]
-               . '</option>' . "\n";
          }
          $i++;
      }
- Line 4860  sub render {
+ Line 5085  sub render {
          </select>
      </td>
  HTML
-     $result .= &Apache::loncommon::end_data_table_row()
+     $result.=&Apache::loncommon::end_data_table_row()
-       . &Apache::loncommon::end_data_table();
+             .&Apache::loncommon::end_data_table();
      return $result;
  }
- Line 4869  HTML
+ Line 5094  HTML
  sub postprocess {
      my $self = shift;
-     my $var    = $self->{'variable'};
+     my $var = $self->{'variable'};
      my $helper = Apache::lonhelper->getHelper();
      $helper->{VARS}->{$var} =
-         $env{"form.$var.layout"} . '|'
+         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
-       . $env{"form.$var.cols"} . '|'
+         $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
-       . $env{"form.$var.paper"} . '|'
-       . $env{"form.$var.pdfFormFields"};
      return 1;
  }
- Line 4910  no strict;
+ Line 5133  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
- sub new {
+ sub new {
      my $self = Apache::lonhelper::element->new();
-     shift;    # disturbs me (probably prevents subclassing) but works (drops
+     shift; # disturbs me (probably prevents subclassing) but works (drops
-               # package descriptor)... - Jeremy
+            # package descriptor)... - Jeremy
      $self->{'variable'} = shift;
      my $helper = Apache::lonhelper::getHelper();
-     $helper->declareVar( $self->{'variable'} );
+     $helper->declareVar($self->{'variable'});
      # The variable name of the format element, so we can look into
      # $helper->{VARS} to figure out whether the columns are one or two
      $self->{'formatvar'} = shift;
      $self->{NEXTSTATE} = shift;
      bless($self);
- Line 4931  sub new {
+ Line 5157  sub new {
  }
  sub render {
-     my $self   = shift;
+     my $self = shift;
      my $helper = Apache::lonhelper::getHelper();
      my $result = '';
-     my $var    = $self->{'variable'};
+     my $var = $self->{'variable'};
-     if ( defined $self->{ERROR_MSG} ) {
-         $result .=
-             '<br /><span class="LC_error">'
+     if (defined $self->{ERROR_MSG}) {
-           . $self->{ERROR_MSG}
+         $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';
-           . '</span><br />';
      }
-     my $format = $helper->{VARS}->{ $self->{'formatvar'} };
+     my $format = $helper->{VARS}->{$self->{'formatvar'}};
      # Use format to get sensible defaults for the margins:
-     my ( $laystyle, $cols, $papersize ) = split( /\|/, $format );
-     ($papersize) = split( / /, $papersize );
+     my ($laystyle, $cols, $papersize) = split(/\|/, $format);
+     ($papersize)                      = split(/ /, $papersize);
      $laystyle = &Apache::lonprintout::map_laystyle($laystyle);
      my %size;
-     (
+     ($size{'width_and_units'},
-         $size{'width_and_units'},
+      $size{'height_and_units'},
-         $size{'height_and_units'},
+      $size{'margin_and_units'})=
-         $size{'margin_and_units'}
+ 	 &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
-     ) = &Apache::lonprintout::page_format( $papersize, $laystyle, $cols );
+     foreach my $dimension ('width','height','margin') {
-     foreach my $dimension ( 'width', 'height', 'margin' ) {
+ 	($size{$dimension},$size{$dimension.'_unit'}) =
-         ( $size{$dimension}, $size{ $dimension . '_unit' } ) =
+ 	    split(/ +/, $size{$dimension.'_and_units'},2);
-           split( / +/, $size{ $dimension . '_and_units' }, 2 );
+ 	foreach my $unit ('cm','in') {
-         foreach my $unit ( 'cm', 'in' ) {
+ 	    $size{$dimension.'_options'} .= '<option ';
-             $size{ $dimension . '_options' } .= '<option ';
+ 	    if ($size{$dimension.'_unit'} eq $unit) {
-             if ( $size{ $dimension . '_unit' } eq $unit ) {
+ 		$size{$dimension.'_options'} .= 'selected="selected" ';
-                 $size{ $dimension . '_options' } .= 'selected="selected" ';
+ 	    }
-             }
+ 	    $size{$dimension.'_options'} .= '>'.$unit.'</option>';
-             $size{ $dimension . '_options' } .= '>' . $unit . '</option>';
+ 	}
-         }
      }
      # Adjust margin for LaTeX margin: .. requires units == cm or in.
-     if ( $size{'margin_unit'} eq 'in' ) {
+     if ($size{'margin_unit'} eq 'in') {
-         $size{'margin'} += 1;
+ 	$size{'margin'} += 1;
-     }
+     }  else {
-     else {
+ 	$size{'margin'} += 2.54;
-         $size{'margin'} += 2.54;
      }
      my %lt = &Apache::lonlocal::texthash(
          'format' => 'How should each column be formatted?',
- Line 4987  sub render {
+ Line 5213  sub render {
          'margin' => 'Left Margin'
      );
-     $result .= '<p>'
+     $result .= '<p>'.$lt{'format'}.'</p>'
-       . $lt{'format'} . '</p>'
+               .&Apache::lonhtmlcommon::start_pick_box()
-       . &Apache::lonhtmlcommon::start_pick_box()
+               .&Apache::lonhtmlcommon::row_title($lt{'width'})
-       . &Apache::lonhtmlcommon::row_title( $lt{'width'} )
+               .'<input type="text" name="'.$var.'.width" value="'.$size{'width'}.'" size="4" />'
-       . '<input type="text" name="'
+               .'<select name="'.$var.'.widthunit">'
-       . $var
+               .$size{'width_options'}
-       . '.width" value="'
+               .'</select>'
-       . $size{'width'}
+               .&Apache::lonhtmlcommon::row_closure()
-       . '" size="4" />'
+               .&Apache::lonhtmlcommon::row_title($lt{'height'})
-       . '<select name="'
+               .'<input type="text" name="'.$var.'.height" value="'.$size{'height'}.'" size="4" />'
-       . $var
+               .'<select name="'.$var.'.heightunit">'
-       . '.widthunit">'
+               .$size{'height_options'}
-       . $size{'width_options'}
+               .'</select>'
-       . '</select>'
+               .&Apache::lonhtmlcommon::row_closure()
-       . &Apache::lonhtmlcommon::row_closure()
+               .&Apache::lonhtmlcommon::row_title($lt{'margin'})
-       . &Apache::lonhtmlcommon::row_title( $lt{'height'} )
+               .'<input type="text" name="'.$var.'.lmargin" value="'.$size{'margin'}.'" size="4" />'
-       . '<input type="text" name="'
+               .'<select name="'.$var.'.lmarginunit">'
-       . $var
+               .$size{'margin_options'}
-       . '.height" value="'
+               .'</select>'
-       . $size{'height'}
+               .&Apache::lonhtmlcommon::row_closure(1)
-       . '" size="4" />'
+               .&Apache::lonhtmlcommon::end_pick_box();
-       . '<select name="'
-       . $var
-       . '.heightunit">'
-       . $size{'height_options'}
-       . '</select>'
-       . &Apache::lonhtmlcommon::row_closure()
-       . &Apache::lonhtmlcommon::row_title( $lt{'margin'} )
-       . '<input type="text" name="'
-       . $var
-       . '.lmargin" value="'
-       . $size{'margin'}
-       . '" size="4" />'
-       . '<select name="'
-       . $var
-       . '.lmarginunit">'
-       . $size{'margin_options'}
-       . '</select>'
-       . &Apache::lonhtmlcommon::row_closure(1)
-       . &Apache::lonhtmlcommon::end_pick_box();
      # <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>
      return $result;
  }
  sub preprocess {
-     my $self   = shift;
+     my $self = shift;
      my $helper = Apache::lonhelper::getHelper();
-     my $format = $helper->{VARS}->{ $self->{'formatvar'} };
+     my $format = $helper->{VARS}->{$self->{'formatvar'}};
      #  If the user does not have 'pav' privilege, set default widths and
      #  on to the next state right away.
      #
-     if ( !$perm{'pav'} ) {
+     if (!$perm{'pav'}) {
-         my $var    = $self->{'variable'};
+ 	my $var = $self->{'variable'};
-         my $format = $helper->{VARS}->{ $self->{'formatvar'} };
+ 	my $format = $helper->{VARS}->{$self->{'formatvar'}};
-         my ( $laystyle, $cols, $papersize ) = split( /\|/, $format );
+ 	my ($laystyle, $cols, $papersize) = split(/\|/, $format);
-         ($papersize) = split( / /, $papersize );
+ 	($papersize)                      = split(/ /, $papersize);
-         $laystyle = &Apache::lonprintout::map_laystyle($laystyle);
+ 	$laystyle = &Apache::lonprintout::map_laystyle($laystyle);
-         #  Figure out some good defaults for the print out and set them:
+ 	#  Figure out some good defaults for the print out and set them:
-         my %size;
-         ( $size{'width'}, $size{'height'}, $size{'lmargin'} ) =
+ 	my %size;
-           &Apache::lonprintout::page_format( $papersize, $laystyle, $cols );
+ 	($size{'width'},
+ 	 $size{'height'},
-         foreach my $dim ( 'width', 'height', 'lmargin' ) {
+ 	 $size{'lmargin'})=
-             my ( $value, $units ) = split( / /, $size{$dim} );
+ 	     &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
-             $helper->{VARS}->{ "$var." . $dim } = $value;
+ 	foreach my $dim ('width', 'height', 'lmargin') {
-             $helper->{VARS}->{ "$var." . $dim . 'unit' } = $units;
+ 	    my ($value, $units) = split(/ /, $size{$dim});
-         }
+ 	    $helper->{VARS}->{"$var.".$dim}      = $value;
+ 	    $helper->{VARS}->{"$var.".$dim.'unit'} = $units;
+ 	}
-         # Transition to the next state
+ 	# Transition to the next state
-         $helper->changeState( $self->{NEXTSTATE} );
+ 	$helper->changeState($self->{NEXTSTATE});
      }
      return 1;
  }
  sub postprocess {
      my $self = shift;
-     my $var    = $self->{'variable'};
+     my $var = $self->{'variable'};
      my $helper = Apache::lonhelper->getHelper();
-     my $width  = $helper->{VARS}->{ $var . '.width' } =
+     my $width = $helper->{VARS}->{$var .'.width'} = $env{"form.${var}.width"};
-       $env{"form.${var}.width"};
+     my $height = $helper->{VARS}->{$var .'.height'} = $env{"form.${var}.height"};
-     my $height = $helper->{VARS}->{ $var . '.height' } =
+     my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $env{"form.${var}.lmargin"};
-       $env{"form.${var}.height"};
+     $helper->{VARS}->{$var .'.widthunit'} = $env{"form.${var}.widthunit"};
-     my $lmargin = $helper->{VARS}->{ $var . '.lmargin' } =
+     $helper->{VARS}->{$var .'.heightunit'} = $env{"form.${var}.heightunit"};
-       $env{"form.${var}.lmargin"};
+     $helper->{VARS}->{$var .'.lmarginunit'} = $env{"form.${var}.lmarginunit"};
-     $helper->{VARS}->{ $var . '.widthunit' }  = $env{"form.${var}.widthunit"};
-     $helper->{VARS}->{ $var . '.heightunit' } = $env{"form.${var}.heightunit"};
-     $helper->{VARS}->{ $var . '.lmarginunit' } =
-       $env{"form.${var}.lmarginunit"};
      my $error = '';
      # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed
      # by an optional period, followed by digits, ending the string
-     if ( $width !~ /^-?[0-9]*(\.[0-9]*)?$/ ) {
+     if ($width !~  /^-?[0-9]*(\.[0-9]*)?$/) {
          $error .= "Invalid width; please type only a number.<br />\n";
      }
-     if ( $height !~ /^-?[0-9]*(\.[0-9]*)?$/ ) {
+     if ($height !~  /^-?[0-9]*(\.[0-9]*)?$/) {
          $error .= "Invalid height; please type only a number.<br />\n";
      }
-     if ( $lmargin !~ /^-?[0-9]*(\.[0-9]*)?$/ ) {
+     if ($lmargin !~  /^-?[0-9]*(\.[0-9]*)?$/) {
          $error .= "Invalid left margin; please type only a number.<br />\n";
-     }
+     } else {
-     else {
+ 	# Adjust for LaTeX 1.0 inch margin:
-         # Adjust for LaTeX 1.0 inch margin:
-         if ( $env{"form.${var}.lmarginunit"} eq "in" ) {
+ 	if ($env{"form.${var}.lmarginunit"} eq "in") {
-             $helper->{VARS}->{ $var . '.lmargin' } = $lmargin - 1;
+ 	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 1;
-         }
+ 	} else {
-         else {
+ 	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 2.54;
-             $helper->{VARS}->{ $var . '.lmargin' } = $lmargin - 2.54;
+ 	}
-         }
      }
-     if ( !$error ) {
+     if (!$error) {
-         Apache::lonhelper::getHelper()->changeState( $self->{NEXTSTATE} );
+         Apache::lonhelper::getHelper()->changeState($self->{NEXTSTATE});
          return 1;
-     }
+     } else {
-     else {
          $self->{ERROR_MSG} = $error;
          return 0;
      }

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

Removed from v.1.575.2.1
changed lines
	Added in v.1.642