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.2 and 1.608

-version 1.575.2.2, 2010/05/11 11:10:19
+version 1.608, 2011/11/07 18:24:42
  Line 1
- #
  # The LearningOnline Network
  # Printout
  #
  Line 45  use Apache::londefdef;
  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;
  # 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. -------------------------
+ # 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($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.
  #
- #  Useful filters that will be filled in by printHelper.
+ # States:
- #  These are put here to support modularizing helpers into
+ #   CHOOSE_INCOMPLETE_SEQ  - Resource selector.
- #  less of a helper soup than it was originally:
- #  These can't be filled in here as there's some conditionalization
- #  involved.
  #
+ sub create_incomplete_folder_helper {
+     my ($helper, $map) = @_;
- my $isProblem;
+     my $filter    = '$res->is_problem()';
- my $isProblemOrMap;
+     $filter      .= ' && $res->resprintable() ';
- my $isNotMap;
+     $filter      .= ' && $res->is_incomplete() ';
- my $isMap;
- my $symbFilter;
- #----------------------------  Helper helpers. -------------------------
+     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 needd for a student 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 99  my $symbFilter;
+ Line 222  my $symbFilter;
  #   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 119  sub generate_student_chooser {
+ Line 246  sub generate_student_chooser {
  CHOOSE_STUDENTS
-     return $result;
+   return $result;
  }
  # Generate the text needed for a resource chooser given the top level of
- Line 140  CHOOSE_STUDENTS
+ Line 267  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 159  sub generate_resource_chooser {
+ Line 290  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 174  CHOOSE_RESOURCES
+ Line 305  CHOOSE_RESOURCES
      return $result;
  }
  #
  #   Generate the helper XML for a code choice helper dialog:
  #
- Line 190  CHOOSE_RESOURCES
+ Line 320  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 201  sub generate_code_selector {
+ Line 334  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 217  sub generate_code_selector {
+ Line 355  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 233  sub generate_code_selector {
+ Line 371  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 251  sub generate_code_selector {
+ Line 391  sub generate_code_selector {
    </state>
  CHOOSE_ANON1
-     return $result;
+    return $result;
  }
- # Returns the XML for the states associated with choosing incomplete problems
+ #  Returns the XML for choosing how assignments are to be formatted
- # for selected students:
+ #  that text must still be parsed by the helper xml parser.
- # Paramterss:
+ # Parameters: 3 (required)
- #   helper     - reference to the helper.
- #   map        - Map within which to generate the selector.
+ #   helper       - The helper; $helper->{'VARS'}->{'PRINT_TYPE'} used
- #   base_state - The first/base state of the helper subsegment.
+ #                  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
+ }
+ #-----------------------------------------------------------------------
+ # 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.
  #
- #  States we will use:
+ # Parameters:
- #   $base_state            - Selects resources.
+ #   $helper - The helper we need $helper->{'VARS'}->{'symb'}
- #   $base_state.WHO        - Selects the people to display.
+ #            to construct the navmap and the iteration.
- #   $base_state.FORMAT     - Selects the final print format etc.
+ #   $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.
  #
+ # Implicit inputs:
+ #   $
+ # Returns:
+ #   reference to an array of resources that can be passed to
+ #   print_resources.
+ #
+ sub master_seq_to_person_seq {
+     my ($helper, $seq, $who) = @_;
- sub generate_incomplete_states {
-     my ($helper, $map, $base_state) = @_;
-     my $result = '';
-     $result .= &generate_resource_chooser(
+     my ($username, $userdomain, $usersection) = split(/:/, $who);
- 					  $base_state,
- 					  'Select Problem(s) to print.',
- 					  "multichoice='1' addstatus='1'",
+     # Toss the sequence up into a hash so that we have O(1) lookup time.
- 					  'RESOURCES',
+     # on the items that come out of the user's list of resources.
- 					  $base_state.'WHO',
+     #
- 					  '',
- 					  '$res->is_incomplete()'
+     my %seq_hash = map {$_  => 1} @$seq;
- 					  );
+     my @output_seq;
-     $result .= &generate_student_chooser(
- 					 $base_state.'WHO',
+     my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}->{'symb'});
- 					 'student_sort',
+     my $navmap           = Apache::lonnavmaps::navmap->new($username, $userdomain);
- 					 'STUDENTS',
+     my $iterator         = $navmap->getIterator($navmap->firstResource(),
- 					 $base_state.'FORMAT');
+ 						$navmap->finishResource(),
-     return $result;
+ 						{}, 1);
+     my %nonResourceItems = (
+ 	$iterator->BEGIN_MAP    => 1,
+ 	$iterator->BEGIN_BRANCH => 1,
+ 	$iterator->END_BRANCH   => 1,
+ 	$iterator->END_MAP      => 1,
+ 	$iterator->FORWARD      => 1,
+ 	$iterator->BACKWARD     => 1
+     );		# These items are not resources but appear in the midst of iteration.
+     #  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 (! exists $nonResourceItems{$curres} && ! $curres->randomout()) {
+ 	    my $symb = $curres->symb();
+ 	    if (exists $seq_hash{$symb}) {
+ 		push(@output_seq, $symb);
+ 	    }
+ 	}
+     }
+     return \@output_seq;		# for now.
  }
- #-----------------------------------------------------------------------
  # Fetch the contents of a resource, uninterpreted.
  # This is used here to fetch a latex file to be included
- Line 303  sub generate_incomplete_states {
+ Line 544  sub generate_incomplete_states {
  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 351  sub set_font_size {
+ Line 591  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 369  sub set_font_size {
+ Line 610  sub set_font_size {
  #
  # Parameters:
  #   pdf_uri   - URI of the PDF file to include.
  #
  # Returns:
  #  The LaTeX to include.
  #
- Line 383  sub include_pdf {
+ Line 624  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;
  }
  #
  #   ssi_with_retries- Does the server side include of a resource.
  #                      if the ssi call returns an error we'll retry it up to
  #                      the number of times requested by the caller.
  #                      If we still have a proble, no text is appended to the
  #                      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 435  sub include_pdf {
+ Line 678  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 451  sub include_pdf {
+ Line 694  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 472  sub ssi_with_retries {
+ Line 714  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 498  sub get_student_view_with_retries {
+ Line 729  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 542  sub printf_style_subst {
+ Line 773  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 552  sub printf_style_subst {
+ Line 784  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('Construction 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 616  sub format_page_header {
+ Line 849  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 630  sub format_page_header {
+ Line 864  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 668  sub letters_to_num {
+ Line 900  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 696  sub is_valid_numeric_code {
+ Line 924  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 729  sub is_valid_alpha_code {
+ Line 956  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 );
      }
  }
- Line 767  sub is_code_valid {
+ Line 993  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 816  sub latex_header_footer_remove {
+ Line 1041  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 843  sub adjust_number_to_print {
+ Line 1066  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 881  sub old_character_chart {
+ Line 1098  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 989  sub old_character_chart {
+ Line 1206  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 1015  sub old_character_chart {
+ Line 1232  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 1071  sub old_character_chart {
+ Line 1288  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 1079  sub old_character_chart {
+ Line 1296  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 1131  sub old_character_chart {
+ Line 1347  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 1143  sub old_character_chart {
+ Line 1358  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 1183  sub old_character_chart {
+ Line 1397  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 1214  sub old_character_chart {
+ Line 1425  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/) {
-     elsif ( $textwidth =~ /(-?\d+\.?\d*)\s*mm/ ) {
+ 	$LaTeXwidth = $1;
-         $LaTeXwidth = $1;
+     } elsif ($textwidth=~/(-?\d+\.?\d*)\s*in/) {
-     }
+ 	$LaTeXwidth = $1*25.4;
-     elsif ( $textwidth =~ /(-?\d+\.?\d*)\s*in/ ) {
-         $LaTeXwidth = $1 * 25.4;
      }
-     $LaTeXwidth .= ' mm';
+     $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);
+ 	my $title=&Apache::lonnet::gettitle($symb);
-         $title = &Apache::lonxml::latex_special_symbols($title);
+ 	$title = &Apache::lonxml::latex_special_symbols($title);
-         $result .=
+ 	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
-           ' \strut \\\\ ' . $title . ' \strut \\\\ ' . $currentURL . ' ';
+     } else {
-     }
+ 	$result.=$currentURL;
-     else {
-         $result .= $currentURL;
      }
-     $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;
  }
- Line 1627  sub unsupported {
+ Line 1799  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 =
+ 	my $resource_src   = $resource->src(); # Essentially the URL of the resource.
-           $resource->src();    # Essentially the URL of the resource.
+ 	$result           .= $resource->title() . '\\\\';
-         $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:
+ 	# Recurse if a .page:
-         elsif ( $resource_src =~
+ 	if ($resource_src =~ /.page$/i) {
- /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm\xhtml|xhtm)$/
+ 	    my $navmap         = Apache::lonnavmaps::navmap->new();
-           )
+ 	    my @page_resources = $navmap->retrieveResources($resource_src);
-         {
+ 	    $result           .= &print_page_in_course($helper, $rparmhash,
-             my $urlp = &Apache::lonnet::clutter($resource_src);
+ 						       $resource_src, \@page_resources);
-             my %form;
+ 	}
-             my %moreenv;
+ 	# these resources go through the XML transformer:
-             &Apache::lonxml::remember_problem_counter();
-             $moreenv{'request.filename'} = $urlp;
-             if ( $helper->{'VARS'}->{'probstatus'} eq 'exam' ) {
-                 $form{'problemtype'} = 'exam';
-             }
-             $form{'grade_target'} = 'tex';
-             $form{'textwidth'}    = &get_textwidth( $helper, $LaTeXwidth );
-             $form{'pdfFormFiels'} = $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' ) {
+ 	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {
-                     $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{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 = &Apache::lonnet::clutter($resource_src);
-             # Print annotations.
+ 	    my %form;
+ 	    my %moreenv;
-             if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 	    &Apache::lonxml::remember_problem_counter();
-                 my $annotation .= &annotate($currentURL);
+ 	    $moreenv{'request.filename'}=$urlp;
-                 $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 	    if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
-             }
+ 	    $form{'grade_target'}  = 'tex';
-             if ( $helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes' ) {
+ 	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
-                 $texversion = &IndexCreation( $texversion, $currentURL );
+ 	    $form{'pdfFormFields'} = $pdfFormFields; #
-             }
+ 	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
-             if ( $helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes' ) {
-                 $texversion =~
+ 	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
- s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+ 	    $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 Construction 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 1904  sub recently_generated {
+ Line 2052  sub recently_generated {
  #    A reference to a page break hash.
  #
  #
- # use Data::Dumper;
+ use Data::Dumper;
  # sub dump_helper_vars {
  #    my ($helper) = @_;
  #    my $helpervars = Dumper($helper->{'VARS'});
  #    &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 1932  sub get_page_breaks {
+ Line 2079  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 1941  sub get_page_breaks {
+ Line 2088  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 1985  sub get_extra_vspaces {
+ Line 2130  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 2027  sub set_form_extraspace {
+ Line 2174  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 2052  sub set_form_extraspace {
+ Line 2199  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;
-         }
+     for (my $member=0;$member<=$#order;$member++) {
-         elsif ( $urlp =~ /\.(sequence|page)$/ ) {
+ 	$resources[$order[$member]]=~/^([^:]*):([^:]*):/;
+ 	my $urlp=$2;
-             # header:
+ 	if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ 	    my $texversion='';
-             $result .=
+ 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
-                 '\strut\newline\noindent Sequence/page '
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-               . $urlp
+ 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
-               . '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		$form{'rndseed'}=$rndseed;
-             # IF sequence, recurse:
+ 		$resources_printed .=$urlp.':';
+ 		$texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
-             if ( $urlp =~ /\.sequence$/ ) {
+ 	    }
-                 my $sequence_url = $urlp;
+ 	    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
-                 my $domain = $env{'user.domain'};  # Constr. space only on local
+ 		($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
-                 my $user   = $env{'user.name'};
+ 	       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+ 		#  Don't permanently modify %$form...
-                 $sequence_url =~ s/^\/res\/$domain/\/home/;
+ 		my %answerform = %form;
-                 $sequence_url =~ s/^(\/home\/$user)/$1\/public_html/;
+ 		$answerform{'grade_target'}='answer';
+ 		$answerform{'answer_output_mode'}='tex';
-               #		$sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ 		$answerform{'rndseed'}=$rndseed;
-                 $result .=
+ 		$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
-                   &print_construction_sequence( $sequence_url, $helper, %form,
+ 		if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
-                     $LaTeXwidth );
+ 		$resources_printed .= $urlp.':';
-             }
+ 		my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
-         }
+ 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-         elsif ( $urlp =~ /\.pdf$/i ) {
+ 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
-             my $texversion;
+ 		} else {
-             if ( $member != 0 ) {
+ 		    # If necessary, encapsulate answer in minipage:
-                 $texversion .= '\cleardoublepage';
-             }
+ 		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 		    my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
-             $texversion .= &include_pdf($urlp);
+ 		    $title = &Apache::lonxml::latex_special_symbols($title);
-             $texversion = &latex_header_footer_remove($texversion);
+ 		    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
-             if ( $member != $#order ) {
+ 		    $body.=&path_to_problem($urlp,$LaTeXwidth);
-                 $texversion .= '\\ \cleardoublepage';
+ 		    $body.='\vskip 1 mm '.$answer.'\end{document}';
-             }
+ 		    $body = &encapsulate_minipage($body);
+ 		    $texversion.=$body;
-             $result .= $texversion;
+ 		}
-         }
+ 	    }
-     }
+ 	    $texversion = &latex_header_footer_remove($texversion);
-     if ( $helper->{VARS}->{'construction'} eq '1' ) {
-         $result =~ s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;
+ 	    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 2220  sub output_data {
+ Line 2363  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 ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+ 	&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' ) {
+     if ($print_type eq 'current_document') {
+       #-- single document - problem, page, html, xml, ...
-         #-- single document - problem, page, html, xml, ...
+ 	my ($currentURL,$cleanURL);
-         my ( $currentURL, $cleanURL );
-         if ( $helper->{'VARS'}->{'construction'} ne '1' ) {
+ 	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 Construction 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] } ) {
+ 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-                 if ( $i != 0 ) {
+ 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
-                     $result .= "\\newpage\n";
+ 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-                 }
+ 	$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
-             }
+ 	$form{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
-             $result .= &get_extra_vspaces( $helper, $master_seq[$i] );
+ 	if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')   ||
-             my ( $sequence, $middle_thingy, $urlp ) =
+ 	    ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') ) {
-               &Apache::lonnet::decode_symb( $master_seq[$i] );
+ 	    $form{'problem_split'}='yes';
-             $urlp = &Apache::lonnet::clutter($urlp);
+ 	}
-             $form{'symb'} = $master_seq[$i];
+ 	my $flag_latex_header_remove = 'NO';
+ 	my $flag_page_in_sequence = 'NO';
-             my $assignment =
+ 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-               &Apache::lonxml::latex_special_symbols(
+ 	my $prevassignment='';
-                 &Apache::lonnet::gettitle($sequence), 'header' )
-               ;    #title of the assignment which contains this problem
+ 	&Apache::lonxml::clear_problem_counter();
-             if ( $selectionmade == 7 ) {
+ 	my $pbreakresources = keys %page_breaks;
-                 $helper->{VARS}->{'assignment'} = $assignment;
+ 	for (my $i=0;$i<=$#master_seq;$i++) {
-             }
-             if ( $i == 0 ) { $prevassignment = $assignment; }
+ 	    &Apache::lonenc::reset_enc();
-             my $texversion = '';
-             if (   $urlp !~ m|^/adm/|
-                 && $urlp =~
+ 	    # Note due to document structure, not allowed to put \newpage
- /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/
+ 	    # prior to the first resource
-               )
-             {
+ 	    if (defined $page_breaks{$master_seq[$i]}) {
-                 $resources_printed .= $urlp . ':';
+ 		if($i != 0) {
-                 &Apache::lonxml::remember_problem_counter();
+ 		    $result.="\\newpage\n";
-                 if ( $flag_latex_header_remove eq 'NO' ) {
+ 		}
-                     $texversion .=
+ 	    }
-                       &print_latex_header( $helper->{'VARS'}->{'LATEX_TYPE'} )
+ 	    $result .= &get_extra_vspaces($helper, $master_seq[$i]);
-                       ;    # RF
+ 	    my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
-                     $flag_latex_header_remove = 'YES';
+ 	    $urlp=&Apache::lonnet::clutter($urlp);
-                 }
+ 	    $form{'symb'}=$master_seq[$i];
-                 $texversion .=
-                   &ssi_with_retries( $urlp, $ssi_retry_count, %form );
+ 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
-                 if ( $urlp =~ /\.page$/ ) {
-                     ( $texversion, my $number_of_columns_page ) =
+ 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
-                       &page_cleanup($texversion);
+ 	    if ($i==0) {$prevassignment=$assignment;}
-                     if ( $number_of_columns_page > $number_of_columns ) {
+ 	    my $texversion='';
-                         $number_of_columns = $number_of_columns_page;
+ 	    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 {
+ 		    } else {
-                             $texversion = '';
+ 			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {
-                         }
+ 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-                     }
+ #			    $texversion =~ s/\\begin{document}//; # FIXME
+ 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
-                 }
+ 			    $title = &Apache::lonxml::latex_special_symbols($title);
-                 if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
-                     my $annotation .= &annotate($urlp);
+ 			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
-                     $texversion =~
+ 			    $body   .='\vskip 1 mm '.$answer;
-                       s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 			    $body    = &encapsulate_minipage($body);
-                 }
+ 			    $texversion .= $body;
+ 			} else {
-                 if ( $flag_latex_header_remove ne 'NO' ) {
+ 			    $texversion='';
-                     $texversion = &latex_header_footer_remove($texversion);
+ 			}
-                 }
+ 		    }
-                 else {
-                     $texversion =~ s/\\end{document}//;
+ 		}
-                 }
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                 if ( $helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes' ) {
+ 		    my $annotation .= &annotate($urlp);
-                     $texversion = &IndexCreation( $texversion, $urlp );
+ 		    $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
-                 }
+ 		}
-                 if (    ( $selectionmade == 4 )
-                     and ( $assignment ne $prevassignment ) )
+ 		if ($flag_latex_header_remove ne 'NO') {
-                 {
+ 		    $texversion = &latex_header_footer_remove($texversion);
-                     my $name         = &get_name();
+ 		} else {
-                     my $courseidinfo = &get_course();
+ 		    $texversion =~ s/\\end{document}//;
-                     $prevassignment = $assignment;
+ 		}
-                     my $header_text = $parmhash{'print_header_format'};
+ 		if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
-                     $header_text = &format_page_header(
+ 		    $texversion=&IndexCreation($texversion,$urlp);
-                         $textwidth,    $header_text, $assignment,
+ 		}
-                         $courseidinfo, $name
+ 		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
-                     );
+ 		    my $name = &get_name();
+ 		    my $courseidinfo = &get_course();
-                     if ( $numberofcolumns eq '1' ) {
+ 		    $prevassignment=$assignment;
-                         $result .=
+ 		    my $header_text = $parmhash{'print_header_format'};
- '\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'
+ 		    $header_text    = &format_page_header($textwidth, $header_text,
-                           . $header_text
+ 							  $assignment,
-                           . '}} \vskip 5 mm ';
+ 							  $courseidinfo,
-                     }
+ 							  $name);
-                     else {
-                         $result .=
+ 		    if ($numberofcolumns eq '1') {
- '\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'
+ 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
-                           . $header_text
+ 		    } else {
-                           . '}} \vskip 5 mm ';
+ 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$header_text.'}} \vskip 5 mm ';
-                     }
+ 		    }
-                 }
+ 		}
-                 $result .= $texversion;
+ 		$result .= $texversion;
-                 $flag_latex_header_remove = 'YES';
+ 		$flag_latex_header_remove = 'YES';
-             }
+ 	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
-             elsif ( $urlp =~ /\/(smppg|syllabus|aboutme|bulletinboard)$/ ) {
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-                 $form{'latex_type'} = $helper->{'VARS'}->{'LATEX_TYPE'};
+ 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
-                 if ( $urlp =~ /\/syllabus$/ ) { $urlp =~ s/\/res//; }
+ 		$resources_printed .= $urlp.':';
-                 $resources_printed .= $urlp . ':';
+ 		my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
-                 my $texversion =
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
-                   &ssi_with_retries( $urlp, $ssi_retry_count, %form );
+ 		    my $annotation = &annotate($urlp);
-                 if ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) {
+ 		    $texversion =~ s/(\\end{document)/$annotation$1/;
-                     my $annotation = &annotate($urlp);
+ 		}
-                     $texversion =~ s/(\\end{document)/$annotation$1/;
-                 }
+ 		if ($flag_latex_header_remove ne 'NO') {
+ 		    $texversion = &latex_header_footer_remove($texversion);
-                 if ( $flag_latex_header_remove ne 'NO' ) {
+ 		} else {
-                     $texversion = &latex_header_footer_remove($texversion);
+ 		    $texversion =~ s/\\end{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
-                 }
+ 		}
-                 else {
+ 		$result .= $texversion;
-                     $texversion =~
+ 		$flag_latex_header_remove = 'YES';
- s/\\end{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
+ 	    } elsif ($urlp=~ /\.pdf$/i) {
-                 }
+ 		if ($i > 0) {
-                 $result .= $texversion;
+ 		    $result .= '\cleardoublepage';
-                 $flag_latex_header_remove = 'YES';
+ 		}
-             }
+                 my $texfrompdf = &include_pdf($urlp);
-             elsif ( $urlp =~ /\.pdf$/i ) {
+                 if ($flag_latex_header_remove ne 'NO') {
-                 if ( $i > 0 ) {
+                     $texfrompdf = &latex_header_footer_remove($texfrompdf);
-                     $result .= '\cleardoublepage';
+                 }
-                 }
+                 $result .= $texfrompdf;
-                 $result .= &include_pdf($urlp);
+ 		if ($i != $#master_seq) {
-                 if ( $i != $#master_seq ) {
+ 		    if ($numberofcolumns eq '1') {
-                     if ( $numberofcolumns eq '1' ) {
+ 			$result .= '\newpage';
-                         $result .= '\newpage';
+ 		    } else {
-                     }
+ 			# the \\'s seem to be needed to let LaTeX know there's something
-                     else {
+ 			# on the page since LaTeX seems to not like to clear an empty page.
+ 			#
-              # the \\'s seem to be needed to let LaTeX know there's something
+ 			$result .= '\\ \cleardoublepage';
-              # on the page since LaTeX seems to not like to clear an empty page.
+ 		    }
-              #
+ 		}
-                         $result .= '\\ \cleardoublepage';
+ 		$flag_latex_header_remove = 'YES';
-                     }
-                 }
+ 	    } else {
-                 $flag_latex_header_remove = 'YES';
+ 		$texversion=&unsupported($urlp,$helper->{'VARS'}->{'LATEX_TYPE'},
+ 					 $master_seq[$i]);
-             }
+ 		if ($flag_latex_header_remove ne 'NO') {
-             else {
+ 		    $texversion = &latex_header_footer_remove($texversion);
-                 $texversion =
+ 		} else {
-                   &unsupported( $urlp, $helper->{'VARS'}->{'LATEX_TYPE'},
+ 		    $texversion =~ s/\\end{document}//;
-                     $master_seq[$i] );
+ 		}
-                 if ( $flag_latex_header_remove ne 'NO' ) {
+ 		$result .= $texversion;
-                     $texversion = &latex_header_footer_remove($texversion);
+ 		$flag_latex_header_remove = 'YES';
-                 }
+ 	    }
-                 else {
+ 	    if (&Apache::loncommon::connection_aborted($r)) {
-                     $texversion =~ s/\\end{document}//;
+ 		last;
-                 }
+ 	    }
-                 $result .= $texversion;
+ 	}
-                 $flag_latex_header_remove = 'YES';
+ 	&Apache::lonxml::clear_problem_counter();
-             }
+ 	if ($flag_page_in_sequence eq 'YES') {
-             if ( &Apache::loncommon::connection_aborted($r) ) {
+ 	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
-                 last;
+ 	}
-             }
+ 	$result .= '\end{document}';
-         }
+      } elsif (($print_type eq 'problems_for_students')           ||
-         &Apache::lonxml::clear_problem_counter();
+ 	      ($print_type eq 'problems_for_students_from_page') ||
-         if ( $flag_page_in_sequence eq 'YES' ) {
+ 	      ($print_type eq 'all_problems_students')           ||
-             $result =~
+ 	      ($print_type eq 'resources_for_students')          ||
-               s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+ 	      ($print_type eq 'incomplete_problems_selpeople_course') ||
-         }
+ 	      ($print_type eq 'map_incomplete_problems_people_seq')){
-         $result .= '\end{document}';
-     }
-     elsif (
+      #-- prints assignments for whole class or for selected students
-         ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students' )
+ 	 my $type;
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq
+ 	 if (($print_type eq 'problems_for_students')           ||
-             'problems_for_students_from_page' )
+ 	     ($print_type eq 'problems_for_students_from_page') ||
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students' )
+ 	     ($print_type eq 'all_problems_students')           ||
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students' )
+ 	     ($print_type eq 'incomplete_problems_selpeople_course') ||
-       )
+ 	     ($print_type eq 'map_incomplete_problems_people_seq')) {
-     {
+ 	     $selectionmade=5;
+ 	     $type='problems';
-         #-- prints assignments for whole class or for selected students
+ 	 } elsif ($print_type eq 'resources_for_students') {
-         my $type;
+ 	     $selectionmade=8;
-         if (
+ 	     $type='resources';
-             ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students' )
+ 	 }
-             || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq
+ 	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
-                 'problems_for_students_from_page' )
+ 	 #   The normal sort order is by section then by students within the
-             || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students' )
+ 	 #   section. If the helper var student_sort is 1, then the user has elected
-           )
+ 	 #   to override this and output the students by name.
-         {
+ 	 #    Each element of the students array is of the form:
-             $selectionmade = 5;
+ 	 #       username:domain:section:last, first:status
-             $type          = 'problems';
+ 	 #
-         }
+ 	 #  Note that student sort is not compatible with printing
-         elsif ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students' )
+ 	 #  1 section per pdf...so that setting overrides.
-         {
+ 	 #
-             $selectionmade = 8;
+ 	 if (($helper->{'VARS'}->{'student_sort'}    eq 1)  &&
-             $type          = 'resources';
+ 	     ($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
-         }
+ 	     @students = sort compare_names  @students;
-         my @students = split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+ 	 }
+ 	 &adjust_number_to_print($helper);
-      #   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
+          if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
-      #   to override this and output the students by name.
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
-      #    Each element of the students array is of the form:
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
-      #       username:domain:section:last, first:status
+ 	 }
-      #
+ 	 # If we are splitting on section boundaries, we need
-      #  Note that student sort is not compatible with printing
+ 	 # to remember that in split_on_sections and
-      #  1 section per pdf...so that setting overrides.
+ 	 # print all of the students in the list.
-      #
+ 	 #
-         if (   ( $helper->{'VARS'}->{'student_sort'} eq 1 )
+ 	 my $split_on_sections = 0;
-             && ( $helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections" ) )
+ 	 if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'section') {
-         {
+ 	     $split_on_sections = 1;
-             @students = sort compare_names @students;
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students+1;
-         }
+ 	 }
-         &adjust_number_to_print($helper);
+ 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-         if (   $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0'
+ 	 #loop over students
-             || $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' )
-         {
+  	 my $flag_latex_header_remove = 'NO';
-             $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students + 1;
+ 	 my %moreenv;
-         }
+          $moreenv{'instructor_comments'}='hide';
+ 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
-         # If we are splitting on section boundaries, we need
+ 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
-         # to remember that in split_on_sections and
+ 	 $moreenv{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
-         # print all of the students in the list.
+ 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
-         #
+ 	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
-         my $split_on_sections = 0;
+ 	 if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')  ||
-         if ( $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'section' ) {
+ 	     ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
-             $split_on_sections = 1;
+ 	     $moreenv{'problem_split'}='yes';
-             $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students + 1;
+ 	 }
-         }
+ 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
-         my @master_seq = split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ 	 my $student_counter=-1;
+ 	 my $i = 0;
-         #loop over students
+ 	 my $last_section = (split(/:/,$students[0]))[2];
+ 	 foreach my $person (@students) {
-         my $flag_latex_header_remove = 'NO';
+              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
-         my %moreenv;
+ 	     if (-e $duefile) {
-         $moreenv{'instructor_comments'} = 'hide';
+ 		 my $temp_file = Apache::File->new('>>'.$duefile);
-         $moreenv{'textwidth'} = &get_textwidth( $helper, $LaTeXwidth );
+ 		 print $temp_file "1969\n";
-         $moreenv{'print_discussions'} =
+ 	     }
-           $helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 	     $student_counter++;
-         $moreenv{'print_annotations'} =
+ 	     if ($split_on_sections) {
-           $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ 		 my $this_section = (split(/:/,$person))[2];
-         $moreenv{'problem_split'}  = $parmhash{'problem_stream_switch'};
+ 		 if ($this_section ne $last_section) {
-         $moreenv{'suppress_tries'} = $parmhash{'suppress_tries'};
+ 		     $i++;
+ 		     $last_section = $this_section;
-         if (   ( $helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes' )
+ 		 }
-             || ( $helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes' ) )
+ 	     } else {
-         {
+ 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
-             $moreenv{'problem_split'} = 'yes';
+ 	     }
-         }
+ 	     my $actual_seq = master_seq_to_person_seq($helper, \@master_seq, $person);
-         my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin(
+ 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
-             $r, 'Print Status',
+ 						     $person,$type,
-             'Class Print Status',
+ 						     \%moreenv,  $actual_seq,
-             $#students + 1,
+ 						     $flag_latex_header_remove,
-             'inline', '75'
+ 						     $LaTeXwidth);
-         );
+ 	     $resources_printed .= ":";
-         my $student_counter = -1;
+ 	     $print_array[$i].=$output;
-         my $i               = 0;
+ 	     $student_names[$i].=$person.':'.$fullname.'_END_';
-         my $last_section    = ( split( /:/, $students[0] ) )[2];
+ #	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
-         foreach my $person (@students) {
+ 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
+ 	     $flag_latex_header_remove = 'YES';
-             my $duefile =
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
- "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
+ 	 }
-             if ( -e $duefile ) {
+ 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-                 my $temp_file = Apache::File->new( '>>' . $duefile );
+ 	 $result .= $print_array[0].'  \end{document}';
-                 print $temp_file "1969\n";
+      } elsif (($print_type eq 'problems_for_anon')      ||
-             }
+ 	      ($print_type eq 'problems_for_anon_page') ||
-             $student_counter++;
+ 	      ($print_type eq 'resources_for_anon')  ) {
-             if ($split_on_sections) {
+ 	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
-                 my $this_section = ( split( /:/, $person ) )[2];
+ 	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
-                 if ( $this_section ne $last_section ) {
+ 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
-                     $i++;
+ 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
-                     $last_section = $this_section;
+ 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
-                 }
+ 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
-             }
+ 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
-             else {
-                 $i = int(
+ 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
-                     $student_counter / $helper->{'VARS'}{'NUMBER_TO_PRINT'} );
+          my @lines = &Apache::grades::get_scantronformat_file();
-             }
+ 	 my ($code_type,$code_length,$bubbles_per_row)=('letter',6,10);
-             my ( $output, $fullname, $printed ) =
+ 	 foreach my $line (@lines) {
-               &print_resources( $r, $helper, $person, $type, \%moreenv,
+              chomp($line);
-                 \@master_seq, $flag_latex_header_remove, $LaTeXwidth );
+ 	     my ($name,$type,$length,$bubbles_per_item) =
-             $resources_printed .= ":";
+                  (split(/:/,$line))[0,2,4,17];
-             $print_array[$i]   .= $output;
+ 	     if ($name eq $code_option) {
-             $student_names[$i] .= $person . ':' . $fullname . '_END_';
+ 		 $code_length=$length;
-             &Apache::lonhtmlcommon::Increment_PrgWin( $r, \%prog_state,
+ 		 if ($type eq 'number') { $code_type = 'number'; }
-                 &mt('last student') . ' ' . $fullname );
+                  chomp($bubbles_per_item);
-             $flag_latex_header_remove = 'YES';
+                  if (($bubbles_per_item ne '') && ($bubbles_per_item > 0)) {
-             if ( &Apache::loncommon::connection_aborted($r) ) { last; }
+                      $bubbles_per_row = $bubbles_per_item;
-         }
+                  }
-         &Apache::lonhtmlcommon::Close_PrgWin( $r, \%prog_state );
+ 	     }
-         $result .= $print_array[0] . '  \end{document}';
+ 	 }
-     }
+ 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
-     elsif (( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon' )
+ 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page' )
+          $moreenv{'instructor_comments'}='hide';
-         || ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon' ) )
+          $moreenv{'bubbles_per_row'} = $bubbles_per_row;
-     {
+ 	 my $seed=time+($$<<16)+($$);
-         my $cdom = $env{ 'course.' . $env{'request.course.id'} . '.domain' };
+ 	 my @allcodes;
-         my $cnum = $env{ 'course.' . $env{'request.course.id'} . '.num' };
+ 	 if ($old_name) {
-         my $num_todo      = $helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
+ 	     my %result=&Apache::lonnet::get('CODEs',
-         my $code_name     = $helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
+ 					     [$old_name,"type\0$old_name"],
-         my $old_name      = $helper->{'VARS'}->{'REUSE_OLD_CODES'};
+ 					     $cdom,$cnum);
-         my $single_code   = $helper->{'VARS'}->{'SINGLE_CODE'};
+ 	     $code_type=$result{"type\0$old_name"};
-         my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
+ 	     @allcodes=split(',',$result{$old_name});
+ 	     $num_todo=scalar(@allcodes);
-         my $code_option = $helper->{'VARS'}->{'CODE_OPTION'};
+ 	 } elsif ($selected_code) { # Selection value is always numeric.
-         my @lines       = &Apache::grades::get_scantronformat_file();
+ 	     $num_todo = 1;
-         my ( $code_type, $code_length ) = ( 'letter', 6 );
+ 	     @allcodes = ($selected_code);
-         foreach my $line (@lines) {
+ 	 } elsif ($single_code) {
-             my ( $name, $type, $length ) = ( split( /:/, $line ) )[ 0, 2, 4 ];
-             if ( $name eq $code_option ) {
+ 	     $num_todo    = 1;	# Unconditionally one code to do.
-                 $code_length = $length;
+ 	     # If an alpha code have to convert to numbers so it can be
-                 if ( $type eq 'number' ) { $code_type = 'number'; }
+ 	     # converted back to letters again :-)
-             }
+ 	     #
-         }
+ 	     if ($code_type ne 'number') {
-         my %moreenv = ( 'textwidth' => &get_textwidth( $helper, $LaTeXwidth ) );
+ 		 $single_code = &letters_to_num($single_code);
-         $moreenv{'problem_split'}       = $parmhash{'problem_stream_switch'};
+ 	     }
-         $moreenv{'instructor_comments'} = 'hide';
+ 	     @allcodes = ($single_code);
-         my $seed = time + ( $$ << 16 ) + ($$);
+ 	 } else {
-         my @allcodes;
+ 	     my %allcodes;
-         if ($old_name) {
+ 	     srand($seed);
-             my %result =
+ 	     for (my $i=0;$i<$num_todo;$i++) {
-               &Apache::lonnet::get( 'CODEs', [ $old_name, "type\0$old_name" ],
+ 		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
-                 $cdom, $cnum );
+ 					    $code_type);
-             $code_type = $result{"type\0$old_name"};
+ 	     }
-             @allcodes  = split( ',', $result{$old_name} );
+ 	     if ($code_name) {
-             $num_todo  = scalar(@allcodes);
+ 		 &Apache::lonnet::put('CODEs',
-         }
+ 				      {
-         elsif ($selected_code) {    # Selection value is always numeric.
+ 					$code_name =>join(',',keys(%allcodes)),
-             $num_todo = 1;
+ 					"type\0$code_name" => $code_type
-             @allcodes = ($selected_code);
+ 				      },
-         }
+ 				      $cdom,$cnum);
-         elsif ($single_code) {
+ 	     }
+ 	     @allcodes=keys(%allcodes);
-             $num_todo = 1;          # Unconditionally one code to do.
+ 	 }
-                  # If an alpha code have to convert to numbers so it can be
+ 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
-                  # converted back to letters again :-)
+ 	 my ($type) = split(/_/,$print_type);
-                  #
+ 	 &adjust_number_to_print($helper);
-             if ( $code_type ne 'number' ) {
+ 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
-                 $single_code = &letters_to_num($single_code);
+ 	 if ($number_per_page eq '0' || $number_per_page eq 'all'
-             }
+ 	     || $number_per_page eq 'section') {
-             @allcodes = ($single_code);
+ 	     $number_per_page=$num_todo > 0 ? $num_todo : 1;
-         }
+ 	 }
-         else {
+ 	 my $flag_latex_header_remove = 'NO';
-             my %allcodes;
+ 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
-             srand($seed);
+ 	 my $count=0;
-             for ( my $i = 0 ; $i < $num_todo ; $i++ ) {
+ 	 foreach my $code (sort(@allcodes)) {
-                 $moreenv{'CODE'} =
+ 	     my $file_num=int($count/$number_per_page);
-                   &get_CODE( \%allcodes, $i, $seed, $code_length, $code_type );
+ 	     if ($code_type eq 'number') {
-             }
+ 		 $moreenv{'CODE'}=$code;
-             if ($code_name) {
+ 	     } else {
-                 &Apache::lonnet::put(
+ 		 $moreenv{'CODE'}=&num_to_letters($code);
-                     'CODEs',
+ 	     }
-                     {
+ 	     my ($output,$fullname, $printed)=
-                         $code_name         => join( ',', keys(%allcodes) ),
+ 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
-                         "type\0$code_name" => $code_type
+ 				  \@master_seq,$flag_latex_header_remove,
-                     },
+ 				  $LaTeXwidth);
-                     $cdom, $cnum
+ 	     $resources_printed .= ":";
-                 );
+ 	     $print_array[$file_num].=$output;
-             }
+ 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-             @allcodes = keys(%allcodes);
+ 				       &mt('last assignment').' '.$fullname);
-         }
+ 	     $flag_latex_header_remove = 'YES';
-         my @master_seq = split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ 	     $count++;
-         my ($type) = split( /_/, $helper->{'VARS'}->{'PRINT_TYPE'} );
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
-         &adjust_number_to_print($helper);
+ 	 }
-         my $number_per_page = $helper->{'VARS'}->{'NUMBER_TO_PRINT'};
+ 	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-         if ( $number_per_page eq '0' || $number_per_page eq 'all' ) {
+ 	 $result .= $print_array[0].'  \end{document}';
-             $number_per_page = $num_todo;
+      } elsif ($print_type eq 'problems_from_directory') {
-         }
+     #prints selected problems from the subdirectory
-         my $flag_latex_header_remove = 'NO';
+ 	$selectionmade = 6;
-         my %prog_state =
+         my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
-           &Apache::lonhtmlcommon::Create_PrgWin( $r, 'Print Status',
+ 	@list_of_files=sort @list_of_files;
-             'Class Print Status',
+ 	my $flag_latex_header_remove = 'NO';
-             $num_todo, 'inline', '75' );
+ 	my $rndseed=time;
-         my $count = 0;
+ 	if ($helper->{'VARS'}->{'curseed'}) {
-         foreach my $code ( sort(@allcodes) ) {
+ 	    $rndseed=$helper->{'VARS'}->{'curseed'};
-             my $file_num = int( $count / $number_per_page );
+ 	}
-             if ( $code_type eq 'number' ) {
+ 	for (my $i=0;$i<=$#list_of_files;$i++) {
-                 $moreenv{'CODE'} = $code;
-             }
-             else {
-                 $moreenv{'CODE'} = &num_to_letters($code);
-             }
-             my ( $output, $fullname, $printed ) =
-               &print_resources( $r, $helper, 'anonymous', $type, \%moreenv,
-                 \@master_seq, $flag_latex_header_remove, $LaTeXwidth );
-             $resources_printed .= ":";
-             $print_array[$file_num] .= $output;
-             &Apache::lonhtmlcommon::Increment_PrgWin( $r, \%prog_state,
-                 &mt('last assignment') . ' ' . $fullname );
-             $flag_latex_header_remove = 'YES';
-             $count++;
-             if ( &Apache::loncommon::connection_aborted($r) ) { last; }
-         }
-         &Apache::lonhtmlcommon::Close_PrgWin( $r, \%prog_state );
-         $result .= $print_array[0] . '  \end{document}';
-     }
-     elsif ( $helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory' ) {
-         #prints selected problems from the subdirectory
-         $selectionmade = 6;
-         my @list_of_files = split /\|\|\|/, $helper->{'VARS'}->{'FILES'};
-         @list_of_files = sort @list_of_files;
-         my $flag_latex_header_remove = 'NO';
-         my $rndseed                  = time;
-         if ( $helper->{'VARS'}->{'curseed'} ) {
-             $rndseed = $helper->{'VARS'}->{'curseed'};
-         }
-         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 Construction 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
+ #-- writing .tex file in prtspool
      my $temp_file;
      my $identifier = &Apache::loncommon::get_cgi_id();
-     my $filename =
+     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
- "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
+     if (!($#print_array>0)) {
-     if ( !( $#print_array > 0 ) ) {
+        unless ($temp_file = Apache::File->new('>'.$filename)) {
-         unless ( $temp_file = Apache::File->new( '>' . $filename ) ) {
+ 	  $r->log_error("Couldn't open $filename for output $!");
-             $r->log_error("Couldn't open $filename for output $!");
+ 	  return SERVER_ERROR;
-             return SERVER_ERROR;
+        }
-         }
+        print $temp_file $result;
-         print $temp_file $result;
+        my $begin=index($result,'\begin{document}',0);
-         my $begin = index( $result, '\begin{document}', 0 );
+        my $inc=substr($result,0,$begin+16);
-         my $inc = substr( $result, 0, $begin + 16 );
+     } else {
-     }
+        my $begin=index($result,'\begin{document}',0);
-     else {
+        my $inc=substr($result,0,$begin+16);
-         my $begin = index( $result, '\begin{document}', 0 );
+        for (my $i=0;$i<=$#print_array;$i++) {
-         my $inc = substr( $result, 0, $begin + 16 );
+ 	  if ($i==0) {
-         for ( my $i = 0 ; $i <= $#print_array ; $i++ ) {
+ 	      $print_array[$i]=$result;
-             if ( $i == 0 ) {
+ 	  } else {
-                 $print_array[$i] = $result;
+ 	      $print_array[$i].='\end{document}';
-             }
+ 	      $print_array[$i] =
-             else {
+ 		&latex_corrections($number_of_columns,$print_array[$i],
-                 $print_array[$i] .= '\end{document}';
+ 				   $selectionmade,
-                 $print_array[$i] =
+ 				   $helper->{'VARS'}->{'ANSWER_TYPE'});
-                   &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)='';
-                 my $anobegin =
+ 	      $print_array[$i]=$inc.$print_array[$i];
-                   index( $print_array[$i], '\setcounter{page}', 0 );
+ 	  }
-                 substr( $print_array[$i], 0, $anobegin ) = '';
+ 	  my $temp_file;
-                 $print_array[$i] = $inc . $print_array[$i];
+ 	  my $newfilename=$filename;
-             }
+ 	  my $num=$i+1;
-             my $temp_file;
+ 	  $newfilename =~s/\.tex$//;
-             my $newfilename = $filename;
+ 	  $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
-             my $num         = $i + 1;
+ 	  unless ($temp_file = Apache::File->new('>'.$newfilename)) {
-             $newfilename =~ s/\.tex$//;
+ 	      $r->log_error("Couldn't open $newfilename for output $!");
-             $newfilename = sprintf( "%s_%03d.tex", $newfilename, $num );
+ 	      return SERVER_ERROR;
-             unless ( $temp_file = Apache::File->new( '>' . $newfilename ) ) {
+ 	  }
-                 $r->log_error("Couldn't open $newfilename for output $!");
+ 	  print $temp_file $print_array[$i];
-                 return SERVER_ERROR;
+        }
-             }
+     }
-             print $temp_file $print_array[$i];
+     my $student_names='';
-         }
+     if ($#print_array>0) {
-     }
+         for (my $i=0;$i<=$#print_array;$i++) {
-     my $student_names = '';
+   	  $student_names.=$student_names[$i].'_ENDPERSON_';
-     if ( $#print_array > 0 ) {
+ 	}
-         for ( my $i = 0 ; $i <= $#print_array ; $i++ ) {
+     } else {
-             $student_names .= $student_names[$i] . '_ENDPERSON_';
+ 	if ($#student_names>-1) {
-         }
+ 	   $student_names=$student_names[0].'_ENDPERSON_';
-     }
+ 	} else {
-     else {
+            my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
-         if ( $#student_names > -1 ) {
+ 	   $student_names=join(':',$env{'user.name'},$env{'user.domain'},
-             $student_names = $student_names[0] . '_ENDPERSON_';
+ 				    $env{'request.course.sec'},$fullname).
-         }
+ 					'_ENDPERSON_'.'_END_';
-         else {
+ 	}
-             my $fullname = &get_name( $env{'user.name'}, $env{'user.domain'} );
+      }
-             $student_names = join( ':',
-                 $env{'user.name'}, $env{'user.domain'},
+      # logic for now is too complex to trace if this has been defined
-                 $env{'request.course.sec'}, $fullname )
+      #  yet.
-               . '_ENDPERSON_' . '_END_';
+      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,
-     # logic for now is too complex to trace if this has been defined
+ 				'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
-     #  yet.
+ 				'cgi.'.$identifier.'.paper'  => $papersize,
-     my $cnum = $env{ 'course.' . $env{'request.course.id'} . '.num' };
+ 				'cgi.'.$identifier.'.selection' => $selectionmade,
-     my $cdom = $env{ 'course.' . $env{'request.course.id'} . '.domain' };
+ 				'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
-     &Apache::lonnet::appenv(
+ 				'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
-         {
+ 				'cgi.'.$identifier.'.role' => $perm{'pav'},
-             'cgi.' . $identifier . '.file'      => $filename,
+ 				'cgi.'.$identifier.'.numberoffiles' => $#print_array,
-             'cgi.' . $identifier . '.layout'    => $laystyle,
+ 				'cgi.'.$identifier.'.studentnames' => $student_names,
-             'cgi.' . $identifier . '.numcol'    => $numberofcolumns,
+ 				'cgi.'.$identifier.'.backref' => $URLback,});
-             'cgi.' . $identifier . '.paper'     => $papersize,
+     &Apache::lonnet::appenv({"cgi.$identifier.user"    => $env{'user.name'},
-             'cgi.' . $identifier . '.selection' => $selectionmade,
+ 				"cgi.$identifier.domain"  => $env{'user.domain'},
-             'cgi.'
+ 				"cgi.$identifier.courseid" => $cnum,
-               . $identifier
+ 				"cgi.$identifier.coursedom" => $cdom,
-               . '.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+ 				"cgi.$identifier.resources" => $resources_printed});
-             'cgi.'
-               . $identifier
+     my $end_page = &Apache::loncommon::end_page();
-               . '.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' ) {
+     # Figure out if we need to filter the output by
-         $namepostfix .= "Name: ";
+     # the incomplete problems for that person
-         $fullname = "CODE - " . $moreenv->{'CODE'};
+     #
+     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 .="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 3342  sub print_resources {
+ Line 3286  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} ) {
-         if ( defined $page_breaks{$curresline} ) {
-             if ( $i != 0 ) {
-                 $current_output .= "\\newpage\n";
-             }
-         }
-         $current_output .= &get_extra_vspaces( $helper, $curresline );
-         $i++;
-         if (
+     my $syllabus_first = 0;
-             !(
+     foreach my $curresline (@{$master_seq})  {
-                 $type eq 'problems'
+ 	if (defined $page_breaks{$curresline}) {
-                 && ( $curresline !~
+ 	    if($i != 0) {
-                     m/\.(problem|exam|quiz|assess|survey|form|library)$/ )
+ 		$current_output.= "\\newpage\n";
-             )
+ 	    }
-           )
+ 	}
-         {
+ 	$current_output .= &get_extra_vspaces($helper, $curresline);
-             my ( $map, $id, $res_url ) =
+ 	$i++;
-               &Apache::lonnet::decode_symb($curresline);
+ 	if ( !($type eq 'problems' &&
-             if ( &Apache::lonnet::allowed( 'bre', $res_url ) ) {
+ 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) ) {
-                 if (   $res_url !~ m|^ext/|
+ 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
-                     && $res_url =~
+ 	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
- /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/
+ 		next;
-                   )
+ 	    }
-                 {
+ 	    $actually_printed++; # we're going to print one.
-                     $printed .= $curresline . ':';
+ 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
-                     &Apache::lonxml::remember_problem_counter();
+ 		if ($res_url!~m|^ext/|
+ 		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
-                     my $rendered =
+ 		    $printed .= $curresline.':';
-                       &get_student_view_with_retries( $curresline,
+ 		    &Apache::lonxml::remember_problem_counter();
-                         $ssi_retry_count, $username, $userdomain,
-                         $env{'request.course.id'},
+ 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
-                         'tex', $moreenv );
+                     if ($res_url =~ /\.page$/) {
-                     if (   ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no' )
+                         if ($remove_latex_header eq 'NO') {
-                         || ( $helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only' ) )
+                             if (!($rendered =~ /\\begin\{document\}/)) {
-                     {
+                                 $rendered = &print_latex_header().$rendered;
+                             }
-         #   Use a copy of the hash so we don't pervert it on future loop passes.
-                         my %answerenv = %{$moreenv};
-                         $answerenv{'answer_output_mode'} = 'tex';
-                         $answerenv{'latex_type'} =
-                           $helper->{'VARS'}->{'LATEX_TYPE'};
-                         &Apache::lonxml::restore_problem_counter();
-                         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';
+ 	}
+ 	if (&Apache::loncommon::connection_aborted($r)) { last; }
+     }
+     # If we are printing incomplete it's possible we don't have
+     # anything to print.  The print subsystem is not so good at handling
+     # that so we're going to generate a stub that says there are no
+     # incomplete resources for the person.
+     #
+     if ($actually_printed == 0) {
+ 	$current_output  = &encapsulate_minipage("\\vskip -10mm \nNo incomplete resources\n \\vskip 100 mm { }\n");
+ 	if ($remove_latex_header eq "NO") {
+ 	    $current_output = &print_latex_header() . $current_output;
+ 	} else {
+ 	    $current_output = &latex_header_footer_remove($current_output);
+ 	}
      }
+     if ($syllabus_first) {
+         $current_output =~ s/\\\\ Last updated:/Last updated:/
+     }
      my $courseidinfo = &get_course();
-     my $currentassignment =
+     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
-       &Apache::lonxml::latex_special_symbols( $helper->{VARS}->{'assignment'},
-         'header' );
      my $header_line =
-       &format_page_header( $LaTeXwidth, $parmhash{'print_header_format'},
+ 	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
-         $currentassignment, $courseidinfo, $fullname, $usersection );
+ 			    $currentassignment, $courseidinfo, $fullname, $usersection);
-     my $header_start =
+     my $header_start = ($columns_in_format == 1) ? '\lhead'
-       ( $columns_in_format == 1 )
+ 	                                         : '\fancyhead[LO]';
-       ? '\lhead'
+     $header_line = $header_start.'{'.$header_line.'}';
-       : '\fancyhead[LO]';
+     if ($current_output=~/\\documentclass/) {
-     $header_line = $header_start . '{' . $header_line . '}';
+ 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
-     if ( $current_output =~ /\\documentclass/ && ( !$syllabus_first ) ) {
+     } else {
-         $current_output =~
+ 	my $blankpages =
- s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
+ 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
-     }
-     elsif ($syllabus_first) {
+ 	$current_output = '\strut\vspace*{-6 mm}\\newline'.
+ 	    &copyright_line().' \newpage '.$blankpages.$end_of_student.
-         $current_output =~ s/\\\\ Last updated:/Last updated:/;
+ 	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
-     }
+ 	    $header_line.$namepostfix.'} \vskip 5 mm '.$current_output;
-     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;
      }
      #
      #  Close the student bracketing.
      #
-     return ( $current_output, $fullname, $printed );
+     return ($current_output,$fullname, $printed);
  }
  sub handler {
      my $r = shift;
      &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) {
+ 	    if (@matches) {
-                 $message =
+ 	        $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.";
- "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>';
+ 	    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 3612  sub get_randomly_ordered_warning {
+ Line 3539  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 3637  sub printHelper {
+ Line 3562  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 3655  sub printHelper {
+ Line 3580  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 so,
+     # Detect whether we're coming from construction space
-     # $helper->{VARS}->{'construction'} will be defined and true.
+     if ($env{'form.postdata'}=~m{^/priv}) {
-     # Otherwise, if this is a post, load the helper 'postdata' var with
+         $helper->{VARS}->{'filename'} = $env{'form.postdata'};
-     # the posted form data.
-     if (
-         $env{'form.postdata'} =~ /^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/ )
-     {
-         $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'});
      # 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 {
+ 	} else {
-             $url          = $helper->{VARS}->{'postdata'};
+ 	    # Resource space.
-             $is_published = 1;                            # From resource space.
-         }
+ 	    $url = $helper->{VARS}->{'postdata'};
-         $url = &Apache::lonnet::clutter($url);
+ 	    $is_published=1;	# From resource space.
-         if ( !$resourceTitle )
+ 	}
-         {    # if the resource doesn't have a title, use the filename
+ 	$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'} ) {
+     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
-         $helper->{VARS}->{'probstatus'} = $env{'form.problemstatus'};
+ 	$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
      }
      my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
- Line 3800  sub printHelper {
+ Line 3716  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
-     $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;
-     $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;
-     $isNotMap = '!$res->is_sequence()';
+     my $isNotMap = '(!$res->is_sequence())';
+     $isNotMap .= $isPrintable unless $userCanPrint;
      $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
-     $isMap      = '$res->is_map()';
+     my $isMap = '$res->is_map()';
-     $symbFilter = '$res->shown_symb()';
+     $isMap .= $isPrintable unless $userCanPrint;
+     my $symbFilter = '$res->shown_symb() ';
-     my $urlValue   = '$res->link()';
+     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<br />before selected').
-           . &mt('Start new page<br />before selected')
+ 	    "' variable='FINISHPAGE' />".
-           . "' variable='FINISHPAGE' />"
+ 	    "<option text='".&mt('Extra space<br />before selected').
-           . "<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<br />check for mm').
-           . "' 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 3847  sub printHelper {
+ Line 3765  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 {
+ 	    my $helperStates = &create_incomplete_folder_helper($helper, $map); # Create needed states for student.
+ 	    &Apache::lonxml::xmlparse($r, 'helper', $helperStates);
+ 	}
-         # Allow problems from sequence
+ 	push(@{$printChoices},
-         push @{$printChoices},
+ 	     [&mt('Selected  [_1]Incomplete Problems[_2] from folder [_3]' . $textSuffix,
-           [
+ 		  '<b>', '</b>',
-             &mt(
+ 		  '<b><i>'. $sequenceTitle . '</b></i>'),
-                 'Selected [_1]Problems[_2] from folder [_3]',
+ 	      $printSelector,
-                 '<b>', '</b>', '<b><i>' . $sequenceTitle . '</i></b>'
+ 	      $nextState]);
-             ),
-             'map_problems',
-             'CHOOSE_PROBLEMS'
-           ];
+         # Allow problems from sequence
+         push @{$printChoices},
+ 	    [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
+ 	     'map_problems',
+ 	     'CHOOSE_PROBLEMS'];
          # Allow all resources from sequence
-         push @{$printChoices},
+         push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
-           [
+ 				'map_problems_pages',
-             &mt(
+ 				'CHOOSE_PROBLEMS_HTML'];
-                 'Selected [_1]Resources[_2] from folder [_3]',
+         my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
-                 '<b>', '</b>', '<b><i>' . $sequenceTitle . '</i></b>'
+ 							'Select Problem(s) to print',
-             ),
+ 							'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-             'map_problems_pages',
+ 							'RESOURCES',
-             'CHOOSE_PROBLEMS_HTML'
+ 							'PAGESIZE',
-           ];
+ 							$map,
-         my $helperFragment = &generate_resource_chooser(
+ 							$isProblem, '',
-             'CHOOSE_PROBLEMS',
+ 							$symbFilter,
-             'Select Problem(s) to print',
+ 							$start_new_option);
-             'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+ 	$helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
-             'RESOURCES',
+ 						      'Select Resource(s) to print',
-             'PAGESIZE',
+ 						      	'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-             $map,
+ 						      'RESOURCES',
-             $isProblem,
+ 						      'PAGESIZE',
-             '',
+ 						      $map,
-             $symbFilter,
+ 						      $isNotMap, '',
-             $start_new_option
+ 						      $symbFilter,
-         );
+ 						      $start_new_option);
-         $helperFragment .= &generate_resource_chooser(
-             'CHOOSE_PROBLEMS_HTML',
-             'Select Resource(s) to print',
-             'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
-             'RESOURCES',
-             'PAGESIZE',
-             $map,
-             $isNotMap,
-             '',
-             $symbFilter,
-             $start_new_option
-         );
-         &Apache::lonxml::xmlparse( $r, 'helper', $helperFragment );
+ 	&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'};
-     if (
-            $perm{'pfo'}
+     if ($perm{'pfo'} &&  !$is_published  &&
-         && !$is_published
+         ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
-         && (   $post_data =~ /\/res\//
-             || $post_data =~ /\/(syllabus|smppg|aboutme|bulletinboard)$/ )
+ 	# BZ 5209 - incomplete problems from entire course:
-       )
-     {
+ 	push(@{$printChoices},
+ 	     [&mtn('Selected <b>Incomplete Problems</b> from <b>entire course</b> for selected people'),
-         push @{$printChoices},
+ 	      'incomplete_problems_selpeople_course', 'INCOMPLETE_PROBLEMS_COURSE_RESOURCES']);
-           [
+ 	my $helperFragment = &create_incomplete_course_helper($helper); # Create needed states.
-             &mtn('Selected <b>Problems</b> from <b>entire course</b>'),
-             'all_problems', 'ALL_PROBLEMS'
+ 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
-           ];
-         push @{$printChoices},
+ 	#  Selected problems/resources from entire course:
-           [
-             &mtn('Selected <b>Resources</b> from <b>entire course</b>'),
+         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
-             'all_resources', 'ALL_RESOURCES'
+ 	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
-           ];
+ 	push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
-         push @{$printChoices},
+ my $suffixXml = <<ALL_PROBLEMS;
-           [
-             &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 4005  sub printHelper {
+ Line 3909  sub printHelper {
        <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
    </state>
  ALL_PROBLEMS
-        #
+          &Apache::lonxml::xmlparse($r, 'helper',
-        #  Support printing incompleteproblems.:
+ 				   &generate_resource_chooser('ALL_PROBLEMS',
-        #
+ 							      'SelectProblem(s) to print',
-        push @{$printChoices},
+ 							      'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
-             [
+ 							      'RESOURCES',
-                &mtn('Incomplete <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'),
+ 							      'PAGESIZE',
- 	     'incomplete_problems_students',
+ 							      '',
- 	     'INCOMPLETE_PROBLEMS_STUDENTS'
+ 							      $isProblemOrMap, $isNotMap,
- 	     ];
+ 							      $symbFilter,
+ 							      $start_new_option) .
-         &Apache::lonxml::xmlparse(
+ 				   &generate_resource_chooser('ALL_RESOURCES',
-             $r, 'helper',
+ 							      'Select Resource(s) to print',
- 	    &generate_incomplete_states($helper, $map,
+ 							      " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1'",
- 			     'INCOMPLETE_PROBLEMS_STUDENTS')
+ 							      'RESOURCES',
+ 							      'PAGESIZE',
-             .&generate_resource_chooser(
+ 							      '',
-                 'ALL_PROBLEMS',
+ 							      $isNotMap,'',$symbFilter,
-                 'SelectProblem(s) to print',
+ 							      $start_new_option) .
- 'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+ 				   &generate_resource_chooser('ALL_PROBLEMS_STUDENTS',
-                 'RESOURCES',
+ 							      'Select Problem(s) to print',
-                 'PAGESIZE',
+ 							      'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
-                 '',
+ 							      'RESOURCES',
-                 $isProblemOrMap,
+ 							      'STUDENTS1',
-                 $isNotMap,
+ 							      '',
-                 $symbFilter,
+ 							      $isProblemOrMap,'' , $symbFilter,
-                 $start_new_option
+ 							      $start_new_option) .
-               )
+ 				     $suffixXml
-               . &generate_resource_chooser(
+ 				   );
-                 'ALL_RESOURCES',
-                 'Select Resource(s) to print',
+ 	if ($helper->{VARS}->{'assignment'}) {
- " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1'",
-                 'RESOURCES',
+ 	    # If we were looking at a page, allow a selection of problems from the page
-                 'PAGESIZE',
+ 	    # either for selected students or for coded assignments.
-                 '',
-                 $isNotMap,
+ 	    if ($page_ispage) {
-                 '',
+ 		push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',
-                 $symbFilter,
+ 					    '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
-                 $start_new_option
+ 					'problems_for_students_from_page', 'CHOOSE_TGT_STUDENTS_PAGE'];
-               )
+ 		push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]CODEd assignments[_5]',
-               . &generate_resource_chooser(
+ 					    '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
-                 'ALL_PROBLEMS_STUDENTS',
+ 					'problems_for_anon_page', 'CHOOSE_ANON1_PAGE'];
-                 'Select Problem(s) to print',
+ 	    }
- 'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+ 	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',
-                 'RESOURCES',
+ 					'<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),
-                 'STUDENTS1',
+ 				    'problems_for_students', 'CHOOSE_STUDENTS'];
-                 '',
+ 	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]',
-                 $isProblemOrMap,
+ 					'<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),
-                 '',
+ 				    'problems_for_anon', 'CHOOSE_ANON1'];
-                 $symbFilter,
+ 	}
-                 $start_new_option
-               )
-               . $suffixXml
-         );
-         if ( $helper->{VARS}->{'assignment'} ) {
+ 	my $randomly_ordered_warning =
+             &get_randomly_ordered_warning($helper, $map);
-      # If we were looking at a page, allow a selection of problems from the page
+ 	# resource_selector will hold a few states that:
-      # either for selected students or for coded assignments.
+ 	#   - 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.
-             if ($page_ispage) {
-                 push @{$printChoices},
-                   [
-                     &mt(
- 'Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',
-                         '<b>',
-                         '</b>',
-                         '<b><i>' . $page_title . '</i></b>',
-                         '<b>',
-                         '</b>'
-                     ),
-                     'problems_for_students_from_page',
-                     'CHOOSE_TGT_STUDENTS_PAGE'
-                   ];
-                 push @{$printChoices},
-                   [
-                     &mt(
- 'Selected [_1]Problems[_2] from page [_3] for [_4]CODEd assignments[_5]',
-                         '<b>',
-                         '</b>',
-                         '<b><i>' . $page_title . '</i></b>',
-                         '<b>',
-                         '</b>'
-                     ),
-                     'problems_for_anon_page',
-                     'CHOOSE_ANON1_PAGE'
-                   ];
-             }
-             push @{$printChoices},
-               [
-                 &mt(
- 'Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',
-                     '<b>',
-                     '</b>',
-                     '<b><i>' . $sequenceTitle . '</i></b>',
-                     '<b>',
-                     '</b>'
-                 ),
-                 'problems_for_students',
-                 'CHOOSE_STUDENTS'
-               ];
-             push @{$printChoices},
-               [
-                 &mt(
- 'Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]',
-                     '<b>',
-                     '</b>',
-                     '<b><i>' . $sequenceTitle . '</i></b>',
-                     '<b>',
-                     '</b>'
-                 ),
-                 'problems_for_anon',
-                 'CHOOSE_ANON1'
-               ];
-         }
-         my $randomly_ordered_warning =
-           &get_randomly_ordered_warning( $helper, $map );
-    # resource_selector will hold a few states that:
+         &Apache::lonxml::xmlparse($r, 'helper',
-    #   - Allow resources to be selected for printing.
+ 				  &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',
-    #   - Determine pagination between assignments.
+ 							    'student_sort',
-    #   - Determine how many assignments should be bundled into a single PDF.
+ 							    'STUDENTS',
-    # TODO:
+ 							    'CHOOSE_STUDENTS_PAGE'));
-    #    Probably good to do things like separate this up into several vars, each
+ 	&Apache::lonxml::xmlparse($r, 'helper',
-    #    with one state, and use REGEXPs at inclusion time to set state names
+ 				  &generate_student_chooser('CHOOSE_STUDENTS',
-    #    and next states for better mix and match capability
+ 							    'student_sort',
-    #
+ 							    'STUDENTS',
-         my $resource_selector = &generate_resource_chooser(
+ 							    'SELECT_PROBLEMS'));
-             'SELECT_PROBLEMS',
+ 	&Apache::lonxml::xmlparse($r, 'helper', $resource_selector);
-             'Select resources to print',
-             'multichoice="1" addstatus="1" closeallpages="1"',
+ 	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-             'RESOURCES',
+ 	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-             'PRINT_FORMATTING',
+         my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
-             $map,
+ 	my $namechoice='<choice></choice>';
-             $isProblem,
+ 	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
-             '',
+ 	    if ($name =~ /^error: 2 /) { next; }
-             $symbFilter,
+ 	    if ($name =~ /^type\0/) { next; }
-             $start_new_option
+ 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
-         );
+ 	}
-         $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(
-             $r, 'helper',
-             &generate_student_chooser(
-                 'CHOOSE_TGT_STUDENTS_PAGE', 'student_sort',
-                 'STUDENTS',                 'CHOOSE_STUDENTS_PAGE'
-             )
-         );
-         &Apache::lonxml::xmlparse(
-             $r, 'helper',
-             &generate_student_chooser(
-                 'CHOOSE_STUDENTS', 'student_sort',
-                 'STUDENTS',        'SELECT_PROBLEMS'
-             )
-         );
-         &Apache::lonxml::xmlparse( $r, 'helper', $resource_selector );
-         my $cdom  = $env{ 'course.' . $env{'request.course.id'} . '.domain' };
-         my $cnum  = $env{ 'course.' . $env{'request.course.id'} . '.num' };
-         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 4236  RESOURCE_SELECTOR
+ Line 4047  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 ) =
+ 	    my ($name,$description,$code_type,$code_length)=
-               ( split( /:/, $line ) )[ 0, 1, 2, 4 ];
+ 		(split(/:/,$line))[0,1,2,4];
-             if (   $code_length > 0
+ 	    if ($code_length > 0 &&
-                 && $code_type =~ /^(letter|number|-1)/ )
+ 		$code_type =~/^(letter|number|-1)/) {
-             {
+ 		$codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';
-                 $codechoice .=
+ 	    }
-                     '<choice computer="'
+ 	}
-                   . $name . '">'
+ 	if ($codechoice eq '') {
-                   . $description
+ 	    $codechoice='<choice computer="default">Default</choice>';
-                   . '</choice>';
+ 	}
-             }
+ 	my $anon1 = &generate_code_selector($helper,
-         }
+ 					    'CHOOSE_ANON1',
-         if ( $codechoice eq '' ) {
+ 					    'SELECT_PROBLEMS',
-             $codechoice = '<choice computer="default">Default</choice>';
+ 					    $codechoice,
-         }
+ 					    $code_selection,
-         my $anon1 =
+ 					    $namechoice) . $resource_selector;
-           &generate_code_selector( $helper, 'CHOOSE_ANON1', 'SELECT_PROBLEMS',
-             $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,
+ 						'CHOOSE_ANON1_PAGE',
-         my $anon_page =
+ 						'SELECT_PROBLEMS_PAGE',
-           &generate_code_selector( $helper, 'CHOOSE_ANON1_PAGE',
+ 						$codechoice,
-             'SELECT_PROBLEMS_PAGE', $codechoice, $code_selection, $namechoice )
+ 						$code_selection,
-           . &generate_resource_chooser(
+ 						$namechoice) .
-             'SELECT_PROBLEMS_PAGE',
+ 			&generate_resource_chooser('SELECT_PROBLEMS_PAGE',
-             'Select Problem(s) to print',
+ 						   'Select Problem(s) to print',
-             "multichoice='1' addstatus='1' closeallpages ='1'",
+ 						   "multichoice='1' addstatus='1' closeallpages ='1'",
-             'RESOURCES',
+ 						   'RESOURCES',
-             'PRINT_FORMATTING',
+ 						   'PRINT_FORMATTING',
-             $url,
+ 						   $url,
-             $isProblem,
+ 						   $isProblem, '',  $symbFilter,
-             '',
+ 						   $start_new_option);
-             $symbFilter,
+ 	&Apache::lonxml::xmlparse($r, 'helper', $anon_page);
-             $start_new_option
-           );
-         &Apache::lonxml::xmlparse( $r, 'helper', $anon_page );
+ 	if ($helper->{VARS}->{'assignment'}) {
-         if ( $helper->{VARS}->{'assignment'} ) {
+ 	    # Assignment printing:
-             push @{$printChoices},
-               [
-                 &mt(
- 'Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]',
-                     '<b>',
-                     '</b>',
-                     '<b><i>' . $sequenceTitle . '</i></b>',
-                     '<b>',
-                     '</b>'
-                 ),
-                 'resources_for_students',
-                 'CHOOSE_STUDENTS1'
-               ];
-             push @{$printChoices},
-               [
-                 &mt(
- 'Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]',
-                     '<b>',
-                     '</b>',
-                     '<b><i>' . $sequenceTitle . '</i></b>',
-                     '<b>',
-                     '</b>'
-                 ),
-                 'resources_for_anon',
-                 'CHOOSE_ANON2'
-               ];
-         }
-         $resource_selector = <<RESOURCE_SELECTOR;
+ 	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+ 	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
+ 	}
+ 	$resource_selector=<<RESOURCE_SELECTOR;
      <state name="SELECT_RESOURCES" title="Select Resources">
      $randomly_ordered_warning
      <nextstate>PRINT_FORMATTING</nextstate>
- Line 4324  RESOURCE_SELECTOR
+ Line 4113  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 4359  RESOURCE_SELECTOR
+ Line 4131  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 4374  CHOOSE_STUDENTS1
+ Line 4146  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 4382  CHOOSE_STUDENTS1
+ Line 4158  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 4397  CHOOSE_STUDENTS1
+ Line 4173  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 4418  CHOOSE_ANON2
+ Line 4196  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 4455  CHOOSE_ANON2
+ Line 4215  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 4465  CHOOSE_FROM_SUBDIR
+ Line 4225  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">
- Line 4507  CHOOSE_FROM_SUBDIR
+ Line 4260  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:");
      $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 4577  CHOOSE_FROM_ANY_SEQUENCE
+ Line 4323  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'}";
- Line 4745  FONT_SELECTION
+ Line 4490  FONT_SELECTION
                     ,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 4815  use Apache::lonlocal;
+ Line 4570  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-Formfields');
-     my $with            = &mt('with Formfields');
+     my $with=&mt('with Formfields');
-     my $without         = &mt('without Formfields');
+     my $without=&mt('without Formfields');
-     $result .= '<h3>'
-       . &mt('Layout Options') . '</h3>'
-       . &Apache::loncommon::start_data_table()
-       . &Apache::loncommon::start_data_table_header_row() . '<th>'
-       . $PageLayout . '</th>' . '<th>'
-       . $NumberOfColumns . '</th>' . '<th>'
-       . $PaperType . '</th>' . '<th>'
-       . $pdfFormLabel . '</th>'
-       . &Apache::loncommon::end_data_table_header_row()
-       . &Apache::loncommon::start_data_table_row() . '<td>'
-       . '<label><input type="radio" name="'
-       . ${var}
-       . '.layout" value="L" />'
-       . $landscape
-       . '</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.='<h3>'.&mt('Layout Options').'</h3>'
+             .&Apache::loncommon::start_data_table()
+             .&Apache::loncommon::start_data_table_header_row()
+             .'<th>'.$PageLayout.'</th>'
+             .'<th>'.$NumberOfColumns.'</th>'
+             .'<th>'.$PaperType.'</th>'
+             .'<th>'.$pdfFormLabel.'</th>'
+             .&Apache::loncommon::end_data_table_header_row()
+             .&Apache::loncommon::start_data_table_row()
+     .'<td>'
+     .'<label><input type="radio" name="'.${var}.'.layout" value="L" />'.$landscape.'</label><br />'
+     .'<label><input type="radio" name="'.${var}.'.layout" value="P" checked="checked" />'.$portrait.'</label>'
+     .'</td>';
+     $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 4929  sub render {
+ Line 4662  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 4938  HTML
+ Line 4671  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 4979  no strict;
+ Line 4710  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 5000  sub new {
+ Line 4734  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 5056  sub render {
+ Line 4790  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") {
+ 	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 1;
-         if ( $env{"form.${var}.lmarginunit"} eq "in" ) {
+ 	} else {
-             $helper->{VARS}->{ $var . '.lmargin' } = $lmargin - 1;
+ 	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 2.54;
-         }
+ 	}
-         else {
-             $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;
      }
  }
  __END__

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

Removed from v.1.575.2.2
changed lines
	Added in v.1.608