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.375 and 1.533

-version 1.375, 2005/05/02 11:23:22
+version 1.533, 2008/05/05 10:16:21
  Line 1
- #  The LearningOnline Network
+ # The LearningOnline Network
  # Printout
  #
  # $Id$
  Line 22
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
  # /home/httpd/html/adm/gpl.txt
- #
  # http://www.lon-capa.org/
  #
  #
- Line 38  use Apache::grades;
+ Line 37  use Apache::grades;
  use Apache::edit;
  use Apache::File();
  use Apache::lonnavmaps;
- use Apache::lonratedt;
+ use Apache::admannotations;
+ use Apache::lonenc;
+ use Apache::entities;
+ use HTTP::Response;
+ use LONCAPA::map();
  use POSIX qw(strftime);
  use Apache::lonlocal;
+ use Carp;
+ use LONCAPA;
+ my %perm;
+ my %parmhash;
+ 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_last_error_resource;	# The resource URI that could not be fetched.
+ my $ssi_last_error;		# 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.
+ # Fetch the contents of a resource, uninterpreted.
+ # This is used here to fetch a latex file to be included
+ # verbatim into the printout<
+ # NOTE: Ask Guy if there is a lonnet function similar to this?
+ #
+ # Parameters:
+ #   URL of the file
+ #
+ sub fetch_raw_resource {
+     my ($url) = @_;
+     my $filename  = &Apache::lonnet::filelocation("", $url);
+     my $contents  = &Apache::lonnet::getfile($filename);
+     if ($contents == -1) {
+ 	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::admannotations::get_annotation($symb, 1);
+     my $result = "";
+     if (length($annotation_text) > 0) {
+ 	$result .= '\\hspace*{\\fill} \\\\[\\baselineskip] \textbf{Annotations:} \\\\ ';
+ 	$result .= "\n";
+ 	$result .= &Apache::lonxml::latex_special_symbols($annotation_text,"");	# Escape latex.
+ 	$result .= "\n\n";
+     }
+     return $result;
+ }
+ #
+ #   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
+ #                      by informing the user that this happened.
+ #
+ # Parameters:
+ #   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.
+ # Side Effects:
+ #   The following global variables can be set:
+ #    ssi_error                - If an unrecoverable error occurred this becomes true.
+ #                               It is up to the caller to initialize this to false
+ #                               if desired.
+ #    ssi_last_error_resource  - If an unrecoverable error occurred, this is the value
+ #                               of the resource that could not be rendered by the ssi
+ #                               call.
+ #    ssi_last_error           - The error string fetched from the ssi response
+ #                               in the event of an error.
+ #
+ sub ssi_with_retries {
+     my ($resource, $retries, %form) = @_;
+     my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
+     if (!$response->is_success) {
+ 	$ssi_error               = 1;
+ 	$ssi_last_error_resource = $resource;
+ 	$ssi_last_error          = $response->code . " " . $response->message;
+         $content='\section*{!!! An error occurred !!!}';
+ 	&Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
+     }
+     return $content;
+ }
+ sub get_student_view_with_retries {
+     my ($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;
+         $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;
+ }
+ #
+ #   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 $result = "";
+     while ($format_string =~ /(%)(\d*)\Q$item\E/g ) {
+ 	my $fmt = $1;
+ 	my $size = $2;
+ 	my $subst = $repl;
+ 	if ($size ne "") {
+ 	    $subst = substr($subst, 0, $size);
+ 	    #  Here's a nice edge case.. supose the end of the
+ 	    #  substring is a \.  In that case may have  just
+ 	    #  chopped off a TeX escape... in that case, we append
+ 	    #   " " for the trailing character, and let the field
+ 	    #  spill over a bit (sigh).
+ 	    #  We don't just chop off the last character in order to deal
+ 	    #  with one last pathology, and that would be if substr had
+ 	    #  trimmed us to e.g. \\\
+ 	    if ($subst =~ /\\$/) {
+ 		$subst .= " ";
+ 	    }
+ 	}
+ 	my $item_pos = pos($format_string);
+ 	$result .= substr($format_string, 0, $item_pos - length($size) -2) . $subst;
+         $format_string = substr($format_string, pos($format_string));
+     }
+     # Put the residual format string into the result:
+     $result .= $format_string;
+     return $result;
+ }
+ # Format a header according to a format.
+ #
+ # Substitutions:
+ #     %a    - Assignment name.
+ #     %c    - Course name.
+ #     %n    - Student name.
+ #
+ sub format_page_header {
+     my ($width, $format, $assignment, $course, $student) = @_;
+     $width = &recalcto_mm($width); # Get width in mm.
+     #  Default format?
+     if ($format eq '') {
+ 	# 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).
+ 	#
+ 	my $chars_per_line = $width/2; # Character/textline.
+ 	my $firstline = "$student $course";
+ 	if (length($firstline) > $chars_per_line) {
+ 	    my $lastchar = $chars_per_line - length($student) - 1;
+ 	    if ($lastchar > 0) {
+ 		$course = substr($course, 0, $lastchar);
+ 	    } else {		# Nothing left of course:
+ 		$course = '';
+ 	    }
+ 	}
+ 	if (length($assignment) > $chars_per_line) {
+ 	    $assignment = substr($assignment, 0, $chars_per_line);
+ 	}
+ 	$format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
+     } else {
+ 	# An open question is how to handle long user formatted page headers...
+ 	# A possible future is to support e.g. %na so that the user can control
+ 	# the truncation of the elements that can appear in the header.
+ 	#
+ 	$format =  &printf_style_subst("a", $format, $assignment);
+ 	$format =  &printf_style_subst("c", $format, $course);
+ 	$format =  &printf_style_subst("n", $format, $student);
+ 	# If the user put %'s in the format string, they  must be escaped
+ 	# to \% else LaTeX will think they are comments and terminate
+ 	# the line.. which is bad!!!
+     }
+     return $format;
+ }
+ #
+ #   Convert a numeric code to letters
+ #
+ sub num_to_letters {
+     my ($num) = @_;
+     my @nums= split('',$num);
+     my @num_to_let=('A'..'Z');
+     my $word;
+     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 %substitution;
+     my $digit = 0;
+     foreach my $letter ('A'..'J') {
+ 	$substitution{$letter} = $digit;
+ 	$digit++;
+     }
+     #  The substitution is done as below to preserve leading
+     #  zeroes which are needed to keep the code size exact
+     #
+     my $result ="";
+     foreach my $letter (@letters) {
+ 	$result.=$substitution{$letter};
+     }
+     return $result;
+ }
+ #  Determine if a code is a valid numeric code.  Valid
+ #  numeric codes must be comprised entirely of digits and
+ #  have a correct number of digits.
+ #
+ #  Parameters:
+ #     value      - proposed code value.
+ #     num_digits - Number of digits required.
+ #
+ sub is_valid_numeric_code {
+     my ($value, $num_digits) = @_;
+     #   Remove leading/trailing whitespace;
+     $value =~ s/^\s*//g;
+     $value =~ s/\s*$//g;
+     #  All digits?
+     if ($value !~ /^[0-9]+$/) {
+ 	return "Numeric code $value has invalid characters - must only be digits";
+     }
+     if (length($value) != $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.
+ # Parameters:
+ #     value          - Proposed code value.
+ #     num_letters    - correct number of letters.
+ # Note:
+ #    leading and trailing whitespace are ignored.
+ #
+ sub is_valid_alpha_code {
+     my ($value, $num_letters) = @_;
+      # 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]+$/) {
+ 	return "Invalid letter code $value must only contain A-J";
+     }
+     if (length($value) != $num_letters) {
+ 	return "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.
+ # Parameters:
+ #    code_value    - the value of the code the user typed in.
+ #    code_option   - The code type selected from the set in the scantron format
+ #                    table.
+ # Returns:
+ #    undef         - The code is valid.
+ #    other         - An error message indicating what's wrong.
+ #
+ sub is_code_valid {
+     my ($code_value, $code_option) = @_;
+     my ($code_type, $code_length) = ('letter', 6);	# defaults.
+     open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+     foreach my $line (<FG>) {
+ 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
+ 	if($name eq $code_option) {
+ 	    $code_length = $length;
+ 	    if($type eq 'number') {
+ 		$code_type = 'number';
+ 	    }
+ 	}
+     }
+     my $valid;
+     if ($code_type eq 'number') {
+ 	return &is_valid_numeric_code($code_value, $code_length);
+     } else {
+ 	return &is_valid_alpha_code($code_value, $code_length);
+     }
- my $resources_printed = '';
+ }
  #   Compare two students by name.  The students are in the form
  #   returned by the helper:
- Line 108  sub latex_header_footer_remove {
+ Line 468  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)) {
+ 	$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
+ #  and comes up with a final value for NUMBER_TO_PRINT which can be:
+ #     all     - if SPLIT_PDFS eq 'all'.
+ #     1       - if SPLIT_PDFS eq 'oneper'
+ #     section - if SPLIT_PDFS eq 'sections'
+ #     <unchanged> - if SPLIT_PDFS eq 'usenumber'
+ #
+ sub adjust_number_to_print {
+     my $helper = shift;
+     my $split_pdf = $helper->{'VARS'}->{'SPLIT_PDFS'};
+     if ($split_pdf eq 'all') {
+ 	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'all';
+     } elsif ($split_pdf eq 'oneper') {
+ 	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 1;
+     } elsif ($split_pdf eq 'sections') {
+ 	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'section';
+     } elsif ($split_pdf eq 'usenumber') {
+ 	#  Unmodified.
+     } 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);
+ }
+ sub old_character_chart {
      my $result = shift;
      $result =~ s/&\#0?0?(7|9);//g;
      $result =~ s/&\#0?(10|13);//g;
- Line 218  sub character_chart {
+ Line 623  sub character_chart {
      $result =~ s/&\#147;/\`\`/g;
      $result =~ s/&\#148;/\'\'/g;
      $result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;
-     $result =~ s/&\#150;/--/g;
+     $result =~ s/&(\#150|\#8211);/--/g;
      $result =~ s/&\#151;/---/g;
      $result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
      $result =~ s/&\#153;/\\texttrademark /g;
- Line 232  sub character_chart {
+ Line 637  sub character_chart {
      $result =~ s/&(\#165|yen);/\\textyen /g;
      $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
      $result =~ s/&(\#167|sect);/\\textsection /g;
-     $result =~ s/&(\#168|uml);/\\texthighdieresis /g;
+     $result =~ s/&(\#168|uml);/\\"\{\} /g;
      $result =~ s/&(\#169|copy);/\\copyright /g;
      $result =~ s/&(\#170|ordf);/\\textordfeminine /g;
      $result =~ s/&(\#172|not);/\\ensuremath\{\\neg\}/g;
- Line 243  sub character_chart {
+ Line 648  sub character_chart {
      $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
      $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
      $result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;
-     $result =~ s/&(\#180|acute);/\\textacute /g;
+     $result =~ s/&(\#180|acute);/\\'\{\} /g;
      $result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;
      $result =~ s/&(\#182|para);/\\P/g;
      $result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;
- Line 315  sub character_chart {
+ Line 720  sub character_chart {
      $result =~ s/&(\#252|uuml);/\\\"{u}/g;
      $result =~ s/&(\#253|yacute);/\\\'{y}/g;
      $result =~ s/&(\#255|yuml);/\\\"{y}/g;
+     $result =~ s/&\#295;/\\ensuremath\{\\hbar\}/g;
      $result =~ s/&\#952;/\\ensuremath\{\\theta\}/g;
  #Greek Alphabet
      $result =~ s/&(alpha|\#945);/\\ensuremath\{\\alpha\}/g;
- Line 390  sub character_chart {
+ Line 796  sub character_chart {
      $result =~ s/&(prod|\#8719);/\\ensuremath\{\\prod\}/g;
      $result =~ s/&(sum|\#8721);/\\ensuremath\{\\sum\}/g;
      $result =~ s/&(minus|\#8722);/\\ensuremath\{-\}/g;
+     $result =~ s/–/\\ensuremath\{-\}/g;
      $result =~ s/&(lowast|\#8727);/\\ensuremath\{*\}/g;
      $result =~ s/&(radic|\#8730);/\\ensuremath\{\\surd\}/g;
      $result =~ s/&(prop|\#8733);/\\ensuremath\{\\propto\}/g;
- Line 423  sub character_chart {
+ Line 830  sub character_chart {
      $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).
+     $result =~ s/&\#8636;/\\ensuremath\{\\leftharpoonup\}/g;
+     $result =~ s/&\#8637;/\\ensuremath\{\\leftharpoondown\}/g;
+     $result =~ s/&\#8640;/\\ensuremath\{\\rightharpoonup\}/g;
+     $result =~ s/&\#8641;/\\ensuremath\{\\rightharpoondown\}/g;
+     $result =~ s/&\#8652;/\\ensuremath\{\\rightleftharpoons\}/g;
+     $result =~ s/&\#8605;/\\ensuremath\{\\leadsto\}/g;
+     $result =~ s/&\#8617;/\\ensuremath\{\\hookleftarrow\}/g;
+     $result =~ s/&\#8618;/\\ensuremath\{\\hookrightarrow\}/g;
+     $result =~ s/&\#8614;/\\ensuremath\{\\mapsto\}/g;
+     $result =~ s/&\#8599;/\\ensuremath\{\\nearrow\}/g;
+     $result =~ s/&\#8600;/\\ensuremath\{\\searrow\}/g;
+     $result =~ s/&\#8601;/\\ensuremath\{\\swarrow\}/g;
+     $result =~ s/&\#8598;/\\ensuremath\{\\nwarrow\}/g;
+     # Left/right quotations:
+     $result =~ s/&(ldquo|#8220);/\`\`/g;
+     $result =~ s/&(rdquo|#8221);/\'\'/g;
      return $result;
  }
- Line 431  sub character_chart {
+ Line 860  sub character_chart {
  my %page_formats=
      ('letter' => {
  	 'book' => {
- 	     '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm'],
+ 	     '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.7 cm']
+ 	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
  	 },
  	 'album' => {
- 	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],
+ 	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','0.394 in'],
- 	     '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 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.16 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' => [],
+ 	     '1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
- 	     '2' => []
+              '2' => ['6.0 in','7.1 in','-1 in','-1 in','5 in']
            },
       },
       'tabloid' => {
- Line 455  my %page_formats=
+ Line 884  my %page_formats=
  	     '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
  	 },
  	 'album' => {
- 	     '1' => [],
+ 	     '1' => ['16 in','9.8 in','-0.57 in','-0.57 in','-0.5 in'],
- 	     '2' => []
+ 	     '2' => ['16 in','4.9 in','-0.57 in','-0.57 in','-0.5 in']
            },
       },
       'executive' => {
- Line 491  my %page_formats=
+ Line 920  my %page_formats=
       },
       'a4' => {
  	 'book' => {
- 	     '1' => ['176 mm','272 mm','-40 pt in','-60 pt','-0.5 in'],
+ 	     '1' => ['17.6 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm'],
- 	     '2' => [ '91 mm','272 mm','-40 pt in','-60 pt','-0.5 in']
+ 	     '2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']
  	 },
  	 'album' => {
- 	     '1' => ['8.5 in','7.7 in','-40 pt in','-60 pt','0 in'],
+ 	     '1' => ['21.59 cm','19.558 cm','-1.397cm','-2.11 cm','0 cm'],
- 	     '2' => ['3.9 in','7.7 in','-40 pt in','-60 pt','0 in']
+ 	     '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
  	 },
       },
       'a5' => {
- Line 540  sub get_name {
+ Line 969  sub get_name {
      if (!defined($udom)) { $udom=$env{'user.domain'}; }
      my $plainname=&Apache::loncommon::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'})) {
- 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+ 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
      }
      return $courseidinfo;
  }
- Line 555  sub get_course {
+ Line 984  sub get_course {
  sub page_format_transformation {
      my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist,$selectionmade) = @_;
      my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
      if ($selectionmade eq '4') {
- 	$assignment='Problems from the Whole Course';
+ 	if ($choice eq 'all_problems') {
+ 	    $assignment='Problems from the Whole Course';
+ 	} else {
+ 	    $assignment='Resources from the Whole Course';
+ 	}
      } else {
  	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
      }
      ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
      my $name = &get_name();
      my $courseidinfo = &get_course();
      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+     my $header_text  = $parmhash{'print_header_format'};
+     $header_text     = &format_page_header($textwidth, $header_text, $assignment,
+ 					   $courseidinfo, $name);
      my $topmargintoinsert = '';
      if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
      my $fancypagestatement='';
      if ($numberofcolumns eq '2') {
- 	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+ 	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
      } else {
- 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+ 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
      }
      if ($layout eq 'album') {
  	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
- Line 613  sub details_for_menu {
+ Line 1052  sub details_for_menu {
      if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
      my $name_of_resource = &Apache::lonnet::gettitle($postdata);
      my $symbolic = &Apache::lonnet::symbread($postdata);
+     return if ( $symbolic eq '');
      my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
      $map=&Apache::lonnet::clutter($map);
      my $name_of_sequence = &Apache::lonnet::gettitle($map);
- Line 628  sub details_for_menu {
+ Line 1069  sub details_for_menu {
      return ($name_of_resource,$name_of_sequence,$name_of_map);
  }
+ sub copyright_line {
+     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 } ';
+ }
+ 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) = @_;
  #    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
-     $result =~ s/\$number_of_columns/$number_of_columns/g;
+     my $copyright = &copyright_line();
-     if ($selectionmade ne '1') {
+     if ($selectionmade eq '1' || $answer_mode eq 'only') {
- 	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
+ 	$result =~ s/(\\end{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
      } else {
- 	$result =~ s/(\\end{document})/\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
+ 	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
      }
+     $result =~ s/\$number_of_columns/$number_of_columns/g;
      $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
      $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
  #-- LaTeX corrections
- Line 650  sub latex_corrections {
+ Line 1094  sub latex_corrections {
  	$first_comment = index($result,'<!--',$first_comment);
      }
      $result =~ s/^\s+$//gm; #remove empty lines
-     $result =~ s/(\s)(\s+)/$1/g; #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;
- Line 661  sub latex_corrections {
+ Line 1106  sub latex_corrections {
      }
      $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
      $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
      return $result;
  }
- Line 696  sub IndexCreation {
+ Line 1140  sub IndexCreation {
  sub print_latex_header {
      my $mode=shift;
-     my $output='\documentclass[letterpaper]{article}';
+     my $output='\documentclass[letterpaper,twoside]{article}\raggedbottom';
-     if (($mode eq 'batchmode') || (!$env{'request.role.adv'})) {
+     if (($mode eq 'batchmode') || (!$perm{'pav'})) {
  	$output.='\batchmode';
      }
      $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
+    	    '\usepackage{multirow}'."\n".
  	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
  	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+ 	     '\usepackage{wrapfig}'.
  	     '\usepackage{picins}\usepackage{calc}'."\n".
+ 	     '\usepackage[T1]{fontenc}'."\n".
+ 	     '\usepackage{ucs}'."\n".
+ 	     '\usepackage[utf8x]{inputenc}'."\n".
+ 	     '\usepacakge{pifont}'  . "\n".
+ 	     '\usepackage{latexsym}'."\n".
+ 	     '\usepackage{amsmath}'.
+ 	     '\usepackage{amssymb}'.
+ 	     '\usepackage{amsfonts}'.
+ 	     '\usepackage{amsthm}'.
+ 	     '\usepackage{amscd}'.
  	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
  	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
  	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
- Line 722  sub print_latex_header {
+ Line 1178  sub print_latex_header {
  sub path_to_problem {
      my ($urlp,$colwidth)=@_;
+     $urlp=&Apache::lonnet::clutter($urlp);
      my $newurlp = '';
      $colwidth=~s/\s*mm\s*$//;
  #characters average about 2 mm in width
      if (length($urlp)*2 > $colwidth) {
- 	my @elements = split '/',$urlp;
+ 	my @elements = split('/',$urlp);
  	my $curlength=0;
  	foreach my $element (@elements) {
+ 	    if ($element eq '') { next; }
  	    if ($curlength+(length($element)*2) > $colwidth) {
- 		$newurlp .=  '|\vskip -1 mm \noindent \verb|';
+ 		$newurlp .=  '|\vskip -1 mm \verb|';
- 		$curlength=0;
+ 		$curlength=length($element)*2;
  	    } else {
  		$curlength+=length($element)*2;
  	    }
- Line 770  sub get_textwidth {
+ Line 1229  sub get_textwidth {
  sub unsupported {
-     my ($currentURL,$mode)=@_;
+     my ($currentURL,$mode,$symb)=@_;
      if ($mode ne '') {$mode='\\'.$mode}
      my $result.= &print_latex_header($mode);
-     if ($currentURL=~/\/ext\//) {
+     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
- 	$result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' ';
+ 	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
+ 	my $title=&Apache::lonnet::gettitle($symb);
+ 	$title = &Apache::lonxml::latex_special_symbols($title);
+ 	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
      } else {
  	$result.=$currentURL;
      }
- Line 784  sub unsupported {
+ Line 1246  sub unsupported {
  #
+ # List of recently generated print files
+ #
+ sub recently_generated {
+     my $r=shift;
+     my $prtspool=$r->dir_config('lonPrtDir');
+     my $zip_result;
+     my $pdf_result;
+     opendir(DIR,$prtspool);
+     my @files =
+ 	grep(/^$env{'user.name'}_$env{'user.domain'}_printout_(\d+)_.*\.(pdf|zip)$/,readdir(DIR));
+     closedir(DIR);
+     @files = sort {
+ 	my ($actime) = (stat($prtspool.'/'.$a))[10];
+ 	my ($bctime) = (stat($prtspool.'/'.$b))[10];
+ 	return $bctime <=> $actime;
+     } (@files);
+     foreach my $filename (@files) {
+ 	my ($ext) = ($filename =~ m/(pdf|zip)$/);
+ 	my ($cdev,$cino,$cmode,$cnlink,
+ 	    $cuid,$cgid,$crdev,$csize,
+ 	    $catime,$cmtime,$cctime,
+ 	    $cblksize,$cblocks)=stat($prtspool.'/'.$filename);
+ 	my $result="<a href='/prtspool/$filename'>".
+ 	    &mt('Generated [_1] ([_2] bytes)',
+ 		&Apache::lonlocal::locallocaltime($cctime),$csize).
+ 		'</a><br />';
+ 	if ($ext eq 'pdf') { $pdf_result .= $result; }
+ 	if ($ext eq 'zip') { $zip_result .= $result; }
+     }
+     if ($zip_result) {
+ 	$r->print('<h4>'.&mt('Recently generated printout zip files')."</h4>\n"
+ 		  .$zip_result);
+     }
+     if ($pdf_result) {
+ 	$r->print('<h4>'.&mt('Recently generated printouts')."</h4>\n"
+ 		  .$pdf_result);
+     }
+ }
+ #
  #   Retrieve the hash of page breaks.
  #
  #  Inputs:
- Line 792  sub unsupported {
+ Line 1297  sub unsupported {
  #    A reference to a page break hash.
  #
  #
+ #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  {
      my ($helper) = @_;
      my %page_breaks;
      foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
  	$page_breaks{$break} = 1;
      }
      return %page_breaks;
  }
+ #  Output a sequence (recursively if neeed)
+ #  from construction space.
+ # Parameters:
+ #    url     = URL of the sequence to print.
+ #    helper  - Reference to the helper hash.
+ #    form    - Copy of the format hash.
+ #    LaTeXWidth
+ # Returns:
+ #   Text to add to the printout.
+ #   NOTE if the first element of the outermost sequence
+ #   is itself a sequence, the outermost caller may need to
+ #   prefix the latex with the page headers stuff.
+ #
+ sub print_construction_sequence {
+     my ($currentURL, $helper, %form, $LaTeXwidth) = @_;
+     my $result;
+     my $rndseed=time;
+     if ($helper->{'VARS'}->{'curseed'}) {
+ 	$rndseed=$helper->{'VARS'}->{'curseed'};
+     }
+     my $errtext=&LONCAPA::map::mapread($currentURL);
+     #
+     #  These make this all support recursing for subsequences.
+     #
+     my @order    = @LONCAPA::map::order;
+     my @resources = @LONCAPA::map::resources;
+     for (my $member=0;$member<=$#order;$member++) {
+ 	$resources[$order[$member]]=~/^([^:]*):([^:]*):/;
+ 	my $urlp=$2;
+ 	if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ 	    my $texversion='';
+ 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		$form{'rndseed'}=$rndseed;
+ 		$resources_printed .=$urlp.':';
+ 		$texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
+ 	    }
+ 	    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ 		($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
+ 	       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+ 		#  Don't permanently modify %$form...
+ 		my %answerform = %form;
+ 		$answerform{'grade_target'}='answer';
+ 		$answerform{'answer_output_mode'}='tex';
+ 		$answerform{'rndseed'}=$rndseed;
+ 		$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+ 		if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
+ 		$resources_printed .= $urlp.':';
+ 		my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
+ 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ 		} else {
+ 		    # If necessary, encapsulate answer in minipage:
+ 		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ 		    my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+ 		    $title = &Apache::lonxml::latex_special_symbols($title);
+ 		    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ 		    $body.=&path_to_problem($urlp,$LaTeXwidth);
+ 		    $body.='\vskip 1 mm '.$answer.'\end{document}';
+ 		    $body = &encapsulate_minipage($body);
+ 		    $texversion.=$body;
+ 		}
+ 	    }
+ 	    $texversion = &latex_header_footer_remove($texversion);
+ 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ 		$texversion=&IndexCreation($texversion,$urlp);
+ 	    }
+ 	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ 		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+ 	    }
+ 	    $result.=$texversion;
+ 	} elsif ($urlp=~/\.(sequence|page)$/) {
+ 	    # header:
+ 	    $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$/) {
+ 		my $sequence_url = $urlp;
+ 		my $domain       = $env{'user.domain'};	# Constr. space only on local
+ 		my $user         = $env{'user.name'};
+ 		$sequence_url    =~ s/^\/res\/$domain/\/home/;
+ 		$sequence_url    =~ s/^(\/home\/$user)/$1\/public_html/;
+ #		$sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+ 		$result .= &print_construction_sequence($sequence_url,
+ 							$helper, %form,
+ 							$LaTeXwidth);
+ 	    }
+ 	}
+     }
+     if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+     return $result;
+ }
  sub output_data {
      my ($r,$helper,$rparmhash) = @_;
      my %parmhash = %$rparmhash;
-     my $html=&Apache::lonxml::xmlbegin();
+     $ssi_error = 0;		# This will be set nonzero by failing ssi's.
-     my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
+     $resources_printed = '';
-     $r->print(<<ENDPART);
+     my $do_postprocessing = 1;
- $html
+     my $js = <<ENDPART;
- <head>
+ <script type="text/javascript">
- <script type="text/javascript" language="Javascript">
      var editbrowser;
      function openbrowser(formname,elementname,only,omit) {
          var url = '/res/?';
- Line 836  $html
+ Line 1447  $html
          editbrowser.focus();
      }
  </script>
- <title>LON-CAPA output for printing</title>
- </head>
- $bodytag
- Please stand by while processing your print request, this may take some time ...
  ENDPART
+     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);
+     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.
- Line 872  ENDPART
+ Line 1484  ENDPART
      my @print_array=();
      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
- Line 891  ENDPART
+ Line 1504  ENDPART
      if ($helper->{'VARS'}->{'showallfoils'} eq "1") {
  	$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'}->{'PRINT_TYPE'} eq 'current_document') {
        #-- single document - problem, page, html, xml, ...
- Line 901  ENDPART
+ Line 1522  ENDPART
  	    $currentURL=$helper->{'VARS'}->{'postdata'};
  	    $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
  	} else {
              #prints resource from the construction space
  	    $currentURL='/'.$helper->{'VARS'}->{'filename'};
  	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
  	    $cleanURL=$currentURL;
  	}
  	$selectionmade = 1;
- 	if ($cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ 	if ($cleanURL!~m|^/adm/|
+ 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
  	    my $rndseed=time;
  	    my $texversion='';
  	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
  		my %moreenv;
  		$moreenv{'request.filename'}=$cleanURL;
- 		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
- 		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
- 		    my $dom = $env{'user.domain'};
- 		    my $user = $env{'user.name'};
- 		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
- 		}
                  if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
  		$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'};
- 		if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
+ 		$form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ 		if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+ 		    ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+ 		    $form{'problem_split'}='yes';
+ 		}
  		if ($helper->{'VARS'}->{'curseed'}) {
  		    $rndseed=$helper->{'VARS'}->{'curseed'};
  		}
  		$form{'rndseed'}=$rndseed;
- 		&Apache::lonnet::appenv(%moreenv);
+ 		&Apache::lonnet::appenv(\%moreenv);
- 		&Apache::lonnet::delenv('form.counter');
- 		&Apache::lonxml::init_counter();
+ 		&Apache::lonxml::clear_problem_counter();
  		$resources_printed .= $currentURL.':';
- 		$texversion.=&Apache::lonnet::ssi($currentURL,%form);
+ 		$texversion.=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
- 		&Apache::lonnet::delenv('form.counter');
+ 		#  Add annotations if required:
+ 		&Apache::lonxml::clear_problem_counter();
  		&Apache::lonnet::delenv('request.filename');
  	    }
+ 	    # 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')) {
  		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  		$form{'grade_target'}='answer';
  		$form{'answer_output_mode'}='tex';
  		$form{'rndseed'}=$rndseed;
+                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {
+ 		    $form{'problemtype'}='exam';
+ 		}
  		$resources_printed .= $currentURL.':';
- 		my $answer=&Apache::lonnet::ssi($currentURL,%form);
+ 		my $answer=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
  		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\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+ 			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($cleanURL,$LaTeXwidth);
  		    } else {
  			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
  			my $URLpath=$cleanURL;
  			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
- 			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+ 			$texversion.=&path_to_problem($URLpath,$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);
  	    }
- Line 972  ENDPART
+ Line 1621  ENDPART
  	    if ($currentURL=~m/\.page\s*$/) {
  		($result,$number_of_columns) = &page_cleanup($result);
  	    }
-         } elsif ($currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
+         } elsif ($cleanURL!~m|^/adm/|
+ 		 && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
              #printing content of sequence from the construction space
- 	    my $flag_latex_header_remove = 'NO';
- 	    my $rndseed=time;
- 	    if ($helper->{'VARS'}->{'curseed'}) {
- 		$rndseed=$helper->{'VARS'}->{'curseed'};
- 	    }
  	    $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
- 	    my $errtext=&Apache::lonratedt::mapread($currentURL);
+ 	    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- 	    for (my $member=0;$member<=$#Apache::lonratedt::order;$member++) {
+ 	    $result .= &print_construction_sequence($currentURL, $helper, %form,
- 		$Apache::lonratedt::resources[$Apache::lonratedt::order[$member]]=~/^([^:]*):([^:]*):/;
+ 						    $LaTeXwidth);
- 		my $urlp=$2;
+ 	    $result .= '\end{document}';
- 		if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+ 	    if (!($result =~ /\\begin\{document\}/)) {
- 		    my $texversion='';
+ 		$result = &print_latex_header() . $result;
- 		    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=&Apache::lonnet::ssi($urlp,%form);
- 		    }
- 		    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
- 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
- 		       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
- 			$form{'grade_target'}='answer';
- 			$form{'answer_output_mode'}='tex';
- 			$form{'rndseed'}=$rndseed;
- 			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-                         if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
- 			$resources_printed .= $urlp.':';
- 			my $answer=&Apache::lonnet::ssi($urlp,%form);
- 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
- 			    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
- 			} else {
- 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- 			    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
- 			    $texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
- 			    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
- 			}
- 		    }
- 		    if ($flag_latex_header_remove ne 'NO') {
- 			$texversion = &latex_header_footer_remove($texversion);
- 		    } else {
- 			$texversion =~ s/\\end{document}//;
- 		    }
- 		    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
- 			$texversion=&IndexCreation($texversion,$urlp);
- 		    }
- 		    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URpL'} eq 'yes') {
- 			$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
- 		    }
- 		    $result.=$texversion;
- 		    $flag_latex_header_remove = 'YES';
- 		} elsif ($urlp=~/\.(sequence|page)$/) {
- 		    $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
- 		}
  	    }
- 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+ 	    # End construction space sequence.
- 	    $result .= '\end{document}';
  	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
  		$resources_printed .= $currentURL.':';
- 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
+ 		my $texversion=&ssi_with_retries($currentURL, $ssi_retry_count, %form);
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ 		    my $annotation = &annotate($currentURL);
+ 		    $texversion    =~ s/(\\end{document})/$annotation$1/;
+ 		}
  		$result .= $texversion;
+ 	} elsif ($cleanURL =~/.tex$/) {
+ 	    # For this sort of print of a single LaTeX file,
+ 	    # We can just print the LaTeX file as it is uninterpreted in any way:
+ 	    #
+ 	    $result = &fetch_raw_resource($currentURL);
+ 	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ 		my $annotation = &annotate($currentURL);
+ 		$result =~ s/(\\end{document})/$annotation$1/;
+ 	    }
+ 	    $do_postprocessing = 0; # Don't massage the result.
  	} else {
- 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'});
+ 	    $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_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') {
  	    $selectionmade = 2;
- Line 1062  ENDPART
+ Line 1683  ENDPART
  	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
  	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  	$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
- 	if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
+ 	$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::lonnet::delenv('form.counter');
- 	&Apache::lonxml::init_counter();
+ 	&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
- Line 1079  ENDPART
+ Line 1709  ENDPART
  		    $result.="\\newpage\n";
  		}
  	    }
- 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+ 	    my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
  	    $urlp=&Apache::lonnet::clutter($urlp);
  	    $form{'symb'}=$master_seq[$i];
- 	    my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
- 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
+ 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
  	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
  	    if ($i==0) {$prevassignment=$assignment;}
  	    my $texversion='';
- 	    if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ 	    if ($urlp!~m|^/adm/|
+ 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
  		$resources_printed .= $urlp.':';
- 		$texversion.=&Apache::lonnet::ssi($urlp,%form);
+ 		&Apache::lonxml::remember_problem_counter();
+ 		$texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
  		if ($urlp=~/\.page$/) {
  		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
  		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}
  		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
  		    $flag_page_in_sequence = 'YES';
  		}
- 		my $lonidsdir=$r->dir_config('lonIDsDir');
- 		my $envfile=$env{'user.environment'};
- 		$envfile=~/\/([^\/]+)\.id$/;
- 		$envfile=$1;
- 		&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
- 		my $current_counter=$env{'form.counter'};
  		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
  		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- 		    $form{'grade_target'}='answer';
+ 		    #  Don't permanently pervert the %form hash
- 		    $form{'answer_output_mode'}='tex';
+ 		    my %answerform = %form;
+ 		    $answerform{'grade_target'}='answer';
+ 		    $answerform{'answer_output_mode'}='tex';
  		    $resources_printed .= $urlp.':';
- 		    my $answer=&Apache::lonnet::ssi($urlp,%form);
- 		    &Apache::lonnet::appenv(('form.counter' => $current_counter));
+ 		    &Apache::lonxml::restore_problem_counter();
+ 		    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 ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
  			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- 			    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($urlp).'}\vskip 0 mm ';
+ 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
- 			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
+ 			    $title = &Apache::lonxml::latex_special_symbols($title);
- 			    $texversion.='\vskip 1 mm '.$answer;
+ 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ 			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
+ 			    $body   .='\vskip 1 mm '.$answer;
+ 			    $body    = &encapsulate_minipage($body);
+ 			    $texversion .= $body;
  			} else {
  			    $texversion='';
  			}
  		    }
+ 		}
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ 		    my $annotation .= &annotate($urlp);
+ 		    $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
  		}
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
- Line 1135  ENDPART
+ Line 1778  ENDPART
  		    my $courseidinfo = &get_course();
  		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
  		    $prevassignment=$assignment;
- 		    $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
+ 		    my $header_text = $parmhash{'print_header_format'};
+ 		    $header_text    = &format_page_header($textwidth, $header_text,
+ 							  $assignment,
+ 							  $courseidinfo,
+ 							  $name);
+ 		    if ($numberofcolumns eq '1') {
+ 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
+ 		    } else {
+ 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$header_text.'}} \vskip 5 mm ';
+ 		    }
  		}
  		$result .= $texversion;
  		$flag_latex_header_remove = 'YES';
- Line 1143  ENDPART
+ Line 1795  ENDPART
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
  		$resources_printed .= $urlp.':';
- 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
+ 		my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
+ 		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ 		    my $annotation = &annotate($urlp);
+ 		    $texversion =~ s/(\\end{document)/$annotation$1/;
+ 		}
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
- Line 1152  ENDPART
+ Line 1809  ENDPART
  		$result .= $texversion;
  		$flag_latex_header_remove = 'YES';
  	    } else {
- 		$texversion=&unsupported($urlp,$helper->{'VARS'}->{'LATEX_TYPE'});
+ 		$texversion=&unsupported($urlp,$helper->{'VARS'}->{'LATEX_TYPE'},
+ 					 $master_seq[$i]);
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
  		} else {
- Line 1163  ENDPART
+ Line 1821  ENDPART
  	    }
  	    if (&Apache::loncommon::connection_aborted($r)) { last; }
  	}
- 	&Apache::lonnet::delenv('form.counter');
+ 	&Apache::lonxml::clear_problem_counter();
  	if ($flag_page_in_sequence eq 'YES') {
  	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
  	}
- Line 1188  ENDPART
+ Line 1846  ENDPART
  	 #    Each element of the students array is of the form:
  	 #       username:domain:section:last, first:status
  	 #
+ 	 #  Note that student sort is not compatible with printing
+ 	 #  1 section per pdf...so that setting overrides.
  	 #
- 	 if ($helper->{'VARS'}->{'student_sort'}    eq 1) {
+ 	 if (($helper->{'VARS'}->{'student_sort'}    eq 1)  &&
+ 	     ($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
  	     @students = sort compare_names  @students;
  	 }
+ 	 &adjust_number_to_print($helper);
           if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
  	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
  	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
  	 }
+ 	 # If we are splitting on section boundaries, we need
+ 	 # to remember that in split_on_sections and
+ 	 # print all of the students in the list.
+ 	 #
+ 	 my $split_on_sections = 0;
+ 	 if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'section') {
+ 	     $split_on_sections = 1;
+ 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students+1;
+ 	 }
  	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
  	 #loop over students
- Line 1204  ENDPART
+ Line 1876  ENDPART
           $moreenv{'instructor_comments'}='hide';
  	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 	 $moreenv{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
  	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
  	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
- 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
+ 	 if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')  ||
+ 	     ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+ 	     $moreenv{'problem_split'}='yes';
+ 	 }
  	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
  	 my $student_counter=-1;
+ 	 my $i = 0;
+ 	 my $last_section = (split(/:/,$students[0]))[2];
  	 foreach my $person (@students) {
               my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
- Line 1217  ENDPART
+ Line 1895  ENDPART
  		 print $temp_file "1969\n";
  	     }
  	     $student_counter++;
- 	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
+ 	     if ($split_on_sections) {
+ 		 my $this_section = (split(/:/,$person))[2];
+ 		 if ($this_section ne $last_section) {
+ 		     $i++;
+ 		     $last_section = $this_section;
+ 		 }
+ 	     } else {
+ 		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
+ 	     }
  	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
  						     $person,$type,
  						     \%moreenv,\@master_seq,
- Line 1239  ENDPART
+ Line 1925  ENDPART
  	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
  	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
  	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
+ 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
+ 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
+ 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
+ 	 open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+ 	 my ($code_type,$code_length)=('letter',6);
+ 	 foreach my $line (<FH>) {
+ 	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
+ 	     if ($name eq $code_option) {
+ 		 $code_length=$length;
+ 		 if ($type eq 'number') { $code_type = 'number'; }
+ 	     }
+ 	 }
  	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
  	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+          $moreenv{'instructor_comments'}='hide';
  	 my $seed=time+($$<<16)+($$);
  	 my @allcodes;
  	 if ($old_name) {
- 	     my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
+ 	     my %result=&Apache::lonnet::get('CODEs',
+ 					     [$old_name,"type\0$old_name"],
+ 					     $cdom,$cnum);
+ 	     $code_type=$result{"type\0$old_name"};
  	     @allcodes=split(',',$result{$old_name});
  	     $num_todo=scalar(@allcodes);
+ 	 } elsif ($selected_code) { # Selection value is always numeric.
+ 	     $num_todo = 1;
+ 	     @allcodes = ($selected_code);
+ 	 } elsif ($single_code) {
+ 	     $num_todo    = 1;	# Unconditionally one code to do.
+ 	     # If an alpha code have to convert to numbers so it can be
+ 	     # converted back to letters again :-)
+ 	     #
+ 	     if ($code_type ne 'number') {
+ 		 $single_code = &letters_to_num($single_code);
+ 	     }
+ 	     @allcodes = ($single_code);
  	 } else {
  	     my %allcodes;
  	     srand($seed);
  	     for (my $i=0;$i<$num_todo;$i++) {
- 		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,'6');
+ 		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
+ 					    $code_type);
  	     }
  	     if ($code_name) {
  		 &Apache::lonnet::put('CODEs',
- 				      {$code_name =>join(',',keys(%allcodes))},
+ 				      {
+ 					$code_name =>join(',',keys(%allcodes)),
+ 					"type\0$code_name" => $code_type
+ 				      },
  				      $cdom,$cnum);
  	     }
  	     @allcodes=keys(%allcodes);
  	 }
  	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
  	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+ 	 &adjust_number_to_print($helper);
  	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
  	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
  	     $number_per_page=$num_todo;
- Line 1271  ENDPART
+ Line 1992  ENDPART
  	 my $count=0;
  	 foreach my $code (sort(@allcodes)) {
  	     my $file_num=int($count/$number_per_page);
- 	     $moreenv{'CODE'}=&num_to_letters($code);
+ 	     if ($code_type eq 'number') {
+ 		 $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,
- Line 1297  ENDPART
+ Line 2022  ENDPART
  	    $rndseed=$helper->{'VARS'}->{'curseed'};
  	}
  	for (my $i=0;$i<=$#list_of_files;$i++) {
+ 	    &Apache::lonenc::reset_enc();
  	    my $urlp = $list_of_files[$i];
  	    $urlp=~s|//|/|;
  	    if ($urlp=~/\//) {
- Line 1308  ENDPART
+ Line 2036  ENDPART
  		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
  		}
  		$resources_printed .= $urlp.':';
- 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
+ 		my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
  		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
  		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- 		    $form{'grade_target'}='answer';
+ 		    #  Don't permanently pervert %form:
- 		    $form{'answer_output_mode'}='tex';
+ 		    my %answerform = %form;
- 		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		    $answerform{'grade_target'}='answer';
- 		    $form{'rndseed'}=$rndseed;
+ 		    $answerform{'answer_output_mode'}='tex';
+ 		    $answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		    $answerform{'rndseed'}=$rndseed;
  		    $resources_printed .= $urlp.':';
- 		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+ 		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
  		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
  			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
  		    } else {
- Line 1333  ENDPART
+ Line 2063  ENDPART
  			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
  		    }
  		}
-                 #this chunck is responsible for printing the path to problem
+                 #this chunk is responsible for printing the path to problem
  		my $newurlp=$urlp;
  		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
  		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
- Line 1358  ENDPART
+ Line 2089  ENDPART
  	$result .= '\end{document}';
      }
  #-------------------------------------------------------- corrections for the different page formats
-     $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
-     $result = &latex_corrections($number_of_columns,$result,$selectionmade);
+     # Only post process if that has not been turned off e.g. by a raw latex resource.
-     for (my $i=1;$i<=$#print_array;$i++) {$print_array[$i] = &latex_corrections($number_of_columns,$print_array[$i],$selectionmade);}
-     #changes page's parameters for the one column output
+     if ($do_postprocessing) {
-     if ($numberofcolumns == 1) {
+ 	$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
+ 	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
+ 				     $helper->{'VARS'}->{'ANSWER_TYPE'});
+ 	#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/\\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
+     if ($helper->{'VARS'}->{'construction'} eq '1') {
+ 	#prints resource from the construction space
+ 	$URLback='/'.$helper->{'VARS'}->{'filename'};
+ 	if ($URLback=~/([^?]+)/) {
+ 	    $URLback=$1;
+ 	    $URLback=~s|^/~|/priv/|;
+ 	}
      }
  #-- writing .tex file in prtspool
      my $temp_file;
      my $identifier = &Apache::loncommon::get_cgi_id();
-     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_".$identifier.".tex";
+     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_$identifier.tex";
      if (!($#print_array>0)) {
- 	unless ($temp_file = Apache::File->new('>'.$filename)) {
+        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);
+        my $begin=index($result,'\begin{document}',0);
- 	my $inc=substr($result,0,$begin+16);
+        my $inc=substr($result,0,$begin+16);
-         for (my $i=0;$i<=$#print_array;$i++) {
+        for (my $i=0;$i<=$#print_array;$i++) {
- 	    if ($i==0) {
+ 	  if ($i==0) {
- 		$print_array[$i]=$result;
+ 	      $print_array[$i]=$result;
- 	    } else {
+ 	  } else {
- 		my $anobegin=index($print_array[$i],'\setcounter{page}',0);
+ 	      $print_array[$i].='\end{document}';
- 		substr($print_array[$i],0,$anobegin)='';
+ 	      $print_array[$i] =
- 		$print_array[$i]=$inc.$print_array[$i].'\end{document}';
+ 		&latex_corrections($number_of_columns,$print_array[$i],
- 	    }
+ 				   $selectionmade,
- 	    my $temp_file;
+ 				   $helper->{'VARS'}->{'ANSWER_TYPE'});
- 	    my $newfilename=$filename;
- 	    my $num=$i+1;
+ 	      my $anobegin=index($print_array[$i],'\setcounter{page}',0);
- 	    $newfilename =~s/\.tex$/_$num\.tex/;
+ 	      substr($print_array[$i],0,$anobegin)='';
- 	    unless ($temp_file = Apache::File->new('>'.$newfilename)) {
+ 	      $print_array[$i]=$inc.$print_array[$i];
- 		$r->log_error("Couldn't open $newfilename for output $!");
+ 	  }
- 		return SERVER_ERROR;
+ 	  my $temp_file;
- 	    }
+ 	  my $newfilename=$filename;
- 	    print $temp_file $print_array[$i];
+ 	  my $num=$i+1;
- 	}
+ 	  $newfilename =~s/\.tex$//;
+ 	  $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
+ 	  unless ($temp_file = Apache::File->new('>'.$newfilename)) {
+ 	      $r->log_error("Couldn't open $newfilename for output $!");
+ 	      return SERVER_ERROR;
+ 	  }
+ 	  print $temp_file $print_array[$i];
+        }
      }
      my $student_names='';
      if ($#print_array>0) {
- 	for (my $i=0;$i<=$#print_array;$i++) {
+         for (my $i=0;$i<=$#print_array;$i++) {
- 	    $student_names.=$student_names[$i].'_ENDPERSON_';
+   	  $student_names.=$student_names[$i].'_ENDPERSON_';
  	}
      } else {
  	if ($#student_names>-1) {
- 	    $student_names=$student_names[0].'_ENDPERSON_';
+ 	   $student_names=$student_names[0].'_ENDPERSON_';
  	} else {
- 	    my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
+            my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
- 	    $student_names=join(':',$env{'user.name'},$env{'user.domain'},
+ 	   $student_names=join(':',$env{'user.name'},$env{'user.domain'},
- 				$env{'request.course.sec'},$fullname).
+ 				    $env{'request.course.sec'},$fullname).
- 				    '_ENDPERSON_'.'_END_';
+ 					'_ENDPERSON_'.'_END_';
  	}
-     }
+      }
-     my $URLback=''; #link to original document
+      # logic for now is too complex to trace if this has been defined
-     if ($helper->{'VARS'}->{'construction'} ne '1') {
+      #  yet.
- 	#prints published resource
+      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- 	$URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
+      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+      &Apache::lonnet::appenv({'cgi.'.$identifier.'.file'   => $filename,
+ 				'cgi.'.$identifier.'.layout'  => $laystyle,
+ 				'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
+ 				'cgi.'.$identifier.'.paper'  => $papersize,
+ 				'cgi.'.$identifier.'.selection' => $selectionmade,
+ 				'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+ 				'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+ 				'cgi.'.$identifier.'.role' => $perm{'pav'},
+ 				'cgi.'.$identifier.'.numberoffiles' => $#print_array,
+ 				'cgi.'.$identifier.'.studentnames' => $student_names,
+ 				'cgi.'.$identifier.'.backref' => $URLback,});
+     &Apache::lonnet::appenv({"cgi.$identifier.user"    => $env{'user.name'},
+ 				"cgi.$identifier.domain"  => $env{'user.domain'},
+ 				"cgi.$identifier.courseid" => $cnum,
+ 				"cgi.$identifier.coursedom" => $cdom,
+ 				"cgi.$identifier.resources" => $resources_printed});
+     my $end_page = &Apache::loncommon::end_page();
+     my $continue_text = &mt('Continue');
+     # If there's been an unrecoverable SSI error, report it to the user
+     if ($ssi_error) {
+         my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
+         $r->print('<br /><h2>'.&mt('An unrecoverable network error occurred:').'</h2><p>  '.
+                   &mt('At least one of the resources you chose to print could not be rendered due to an unrecoverable error when communicating with a server:').
+                   '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
+                   '</p><p>'.&mt('You can continue using the link provided below, but make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
+                   &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 {
- 	#prints resource from the construction space
+ 	$r->print(<<FINALEND);
- 	$URLback='/'.$helper->{'VARS'}->{'filename'};
- 	if ($URLback=~/([^?]+)/) {
- 	    $URLback=$1;
- 	    $URLback=~s|^/~|/priv/|;
- 	}
-     }
-     # logic for now is too complex to trace if this has been defined
-     #  yet.
-     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-     &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,
-                             'cgi.'.$identifier.'.layout'  => $laystyle,
-                             'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
- 			    'cgi.'.$identifier.'.paper'  => $papersize,
-                             'cgi.'.$identifier.'.selection' => $selectionmade,
- 			    'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
- 			    'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
- 			    'cgi.'.$identifier.'.role' => $env{'request.role.adv'},
-                             '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);
- $r->print(<<FINALEND);
  <br />
  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
- <a href="/cgi-bin/printout.pl?$identifier">Continue</a>
+ <a href="/cgi-bin/printout.pl?$identifier">$continue_text</a>
- </body>
+ $end_page
- </html>
  FINALEND
+     }                                     # endif ssi errors.
  }
- sub num_to_letters {
-     my ($num) = @_;
-     my @nums= split('',$num);
-     my @num_to_let=('A'..'Z');
-     my $word;
-     foreach my $digit (@nums) { $word.=$num_to_let[$digit]; }
-     return $word;
- }
  sub get_CODE {
-     my ($all_codes,$num,$seed,$size)=@_;
+     my ($all_codes,$num,$seed,$size,$type)=@_;
      my $max='1'.'0'x$size;
      my $newcode;
      while(1) {
- 	$newcode=sprintf("%06d",int(rand($max)));
+ 	$newcode=sprintf("%0".$size."d",int(rand($max)));
  	if (!exists($$all_codes{$newcode})) {
  	    $$all_codes{$newcode}=1;
- 	    return &num_to_letters($newcode);
+ 	    if ($type eq 'number' ) {
+ 		return $newcode;
+ 	    } else {
+ 		return &num_to_letters($newcode);
+ 	    }
  	}
      }
  }
- Line 1490  sub print_resources {
+ Line 2244  sub print_resources {
      my $printed = '';
      my ($username,$userdomain,$usersection) = split /:/,$person;
      my $fullname = &get_name($username,$userdomain);
-     my $namepostfix;
+     my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
      if ($person =~ 'anon') {
- 	$namepostfix="\\\\Name: ";
+ 	$namepostfix .="Name: ";
  	$fullname = "CODE - ".$moreenv->{'CODE'};
      }
+     #  Fullname may have special latex characters that need \ prefixing:
+     #
      my $i           = 0;
      #goes through all resources, checks if they are available for
      #current student, and produces output
-     &Apache::lonnet::delenv('form.counter');
-     &Apache::lonxml::init_counter();
+     &Apache::lonxml::clear_problem_counter();
      my %page_breaks  = &get_page_breaks($helper);
+     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
+     #   e.g. \special{ps:\ENDOFSTUDENTSTAMP}  unfortunately,
+     #   The special gets passed the \ and dvips puts it in the output file
+     #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
+     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
+     #
      foreach my $curresline (@{$master_seq})  {
  	if (defined $page_breaks{$curresline}) {
- Line 1510  sub print_resources {
+ Line 2278  sub print_resources {
  	    }
  	}
  	$i++;
  	if ( !($type eq 'problems' &&
  	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
  	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
  	    if (&Apache::lonnet::allowed('bre',$res_url)) {
- 		if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ 		if ($res_url!~m|^ext/|
+ 		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
  		    $printed .= $curresline.':';
- 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
- 		    my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		    &Apache::lonxml::remember_problem_counter();
- 		    my $envfile=$env{'user.environment'};
- 		    $envfile=~/\/([^\/]+)\.id$/;
+ 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
- 		    $envfile=$1;
- 		    &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
- 		    my $current_counter=$env{'form.counter'};
  		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
  		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- 			$moreenv->{'answer_output_mode'}='tex';
+ 			#   Use a copy of the hash so we don't pervert it on future loop passes.
- 			$moreenv->{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 			my %answerenv = %{$moreenv};
- 			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%{$moreenv});
+ 			$answerenv{'answer_output_mode'}='tex';
- 			&Apache::lonnet::appenv(('form.counter' => $current_counter));
+ 			$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 {
- 			    $rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- 			    $rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
- 			    $rendered.=&path_to_problem ($curresline,$LaTeXwidth);
+ 			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- 			    $rendered.='\vskip 1 mm '.$ansrendered;
+ 			    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') {
+ 			my $url = &Apache::lonnet::clutter($res_url);
+ 			my $annotation = &annotate($url);
+ 			$rendered =~  s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ 		    }
  		    if ($remove_latex_header eq 'YES') {
  			$rendered = &latex_header_footer_remove($rendered);
  		    } else {
- Line 1546  sub print_resources {
+ Line 2331  sub print_resources {
  		    $current_output .= $rendered;
  		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
  		    $printed .= $curresline.':';
- 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+ 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
- 		    my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
- 		    my $envfile=$env{'user.environment'};
+ 			my $url = &Apache::lonnet::clutter($res_url);
- 		    $envfile=~/\/([^\/]+)\.id$/;
+ 			my $annotation = &annotate($url);
- 		    $envfile=$1;
+ 			$annotation    =~ s/(\\end{document})/$annotation$1/;
- 		    &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
+ 		    }
- 		    my $current_counter=$env{'form.counter'};
  		    if ($remove_latex_header eq 'YES') {
  			$rendered = &latex_header_footer_remove($rendered);
  		    } else {
  			$rendered =~ s/\\end{document}//;
  		    }
  		    $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
  		} else {
- 		    my $rendered = &unsupported($res_url,$helper->{'VARS'}->{'LATEX_TYPE'});
+ 		    my $rendered = &unsupported($res_url,$helper->{'VARS'}->{'LATEX_TYPE'},$curresline);
  		    if ($remove_latex_header ne 'NO') {
  			$rendered = &latex_header_footer_remove($rendered);
  		    } else {
- Line 1577  sub print_resources {
+ Line 2362  sub print_resources {
      if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
      if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
      my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
+     my $header_line =
+ 	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+ 			    $currentassignment, $courseidinfo, $fullname);
+     my $header_start = ($columns_in_format == 1) ? '\lhead'
+ 	                                         : '\fancyhead[LO]';
+     $header_line = $header_start.'{'.$header_line.'}';
      if ($current_output=~/\\documentclass/) {
- 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}}\\vskip 5 mm /;
+ 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
      } else {
- 	my $blankpages = '';
+ 	my $blankpages =
- 	for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
+ 	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
- 	$current_output = '\strut\vspace*{-6 mm}\\newline\\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 }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
+ 	$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);
  }
- Line 1591  sub print_resources {
+ Line 2390  sub print_resources {
  sub handler {
      my $r = shift;
-     my $helper;
+     &init_perm();
- #    my $loaderror=&Apache::lonnet::overloaderror($r);
- #    if ($loaderror) { return $loaderror; }
- #    $loaderror=
+     my $helper = printHelper($r);
- #       &Apache::lonnet::overloaderror($r,
+     if (!ref($helper)) {
- #         $env{'course.'.$env{'request.course.id'}.'.home'});
+ 	return $helper;
- #    if ($loaderror) { return $loaderror; }
-     my $result = printHelper($r);
-     if (!ref($result)) {
- 	return $result;
      }
-     $helper = $result;
- #	my $key;
- #	foreach $key (keys %{$helper->{'VARS'}}) {
- #	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
- #	}
- #	foreach $key (keys %env) {
- #	    $r->print(' '.$key.'->'.$env{$key}.'<-<br />');
- #	}
- #	return OK;
-     my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+     %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
- #	my $key;
- #	foreach $key (keys %parmhash) {
- #	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
- #	}
- #
      #  If a figure conversion queue file exists for this user.domain
- Line 1632  sub handler {
+ Line 2414  sub handler {
      if(-e $conversion_queuefile) {
  	unlink $conversion_queuefile;
      }
      &output_data($r,$helper,\%parmhash);
      return OK;
  }
- Line 1645  sub addMessage {
+ Line 2429  sub addMessage {
      Apache::lonhelper::message->new();
  }
- use Data::Dumper;
+ sub init_perm {
+     undef(%perm);
+     $perm{'pav'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});
+     if (!$perm{'pav'}) {
+ 	$perm{'pav'}=&Apache::lonnet::allowed('pav',
+ 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+     }
+     $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
+     if (!$perm{'pfo'}) {
+ 	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
+ 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+     }
+ }
+ sub get_randomly_ordered_warning {
+     my ($helper,$map) = @_;
+     my $message;
+     my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
+     my $navmap = Apache::lonnavmaps::navmap->new();
+     my $res = $navmap->getResourceByUrl($map);
+     if ($res) {
+ 	my $func =
+ 	    sub { return ($_[0]->is_map() && $_[0]->randomorder); };
+ 	my @matches = $navmap->retrieveResources($res, $func,1,1,1);
+ 	if (@matches) {
+ 	    $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
+ 	}
+     }
+     if ($message) {
+ 	return '<message type="warning">'.$message.'</message>';
+     }
+     return;
+ }
  sub printHelper {
      my $r = shift;
- Line 1688  sub printHelper {
+ Line 2508  sub printHelper {
      $helper->declareVar('FINISHPAGE');
      $helper->declareVar('PRINT_TYPE');
      $helper->declareVar("showallfoils");
+     $helper->declareVar("STUDENTS");
-     #  The page breaks can get loaded initially from the course environment:
-     if((!defined($env{"form.CURRENT_STATE"}))  ||
-        ($env{'form.CURRENT_STATE'} == "START")) {
- 	$helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g.
-     }
+     #  The page breaks can get loaded initially from the course environment:
+     # But we only do this in the initial state so that they are allowed to change.
+     #
+     # $helper->{VARS}->{FINISHPAGE} = '';
      &Apache::loncommon::restore_course_settings('print',
  						{'pagebreaks'  => 'scalar',
  					         'lastprinttype' => 'scalar'});
-     if("$helper->{VARS}->{PRINT_TYPE}" eq "$env{'form.lastprinttype'}") {
- 	$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
-     }
      # 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'};
+ 	} else {
+ 	    my $state = $env{"form.CURRENT_STATE"};
+ 	    if ($state eq "START") {
+ 		$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+ 	    }
+ 	}
+     }
      # Detect whether we're coming from construction space
      if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
          $helper->{VARS}->{'filename'} = "~$1/$2";
- Line 1717  sub printHelper {
+ Line 2548  sub printHelper {
      } else {
          if ($env{'form.postdata'}) {
              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
+ 	    if ( $helper->{VARS}->{'symb'} eq '') {
+ 		$helper->{VARS}->{'postdata'} = $env{'form.postdata'};
+ 	    }
          }
          if ($env{'form.symb'}) {
              $helper->{VARS}->{'symb'} = $env{'form.symb'};
- Line 1724  sub printHelper {
+ Line 2558  sub printHelper {
          if ($env{'form.url'}) {
              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
          }
      }
      if ($env{'form.symb'}) {
- Line 1743  sub printHelper {
+ Line 2578  sub printHelper {
      my $symb = $helper->{VARS}->{'symb'};
      my ($map, $id, $url);
      my $subdir;
+     my $is_published=0;		# True when printing from resource space.
      # Get the resource name from construction space
      if ($helper->{VARS}->{'construction'}) {
- Line 1751  sub printHelper {
+ Line 2587  sub printHelper {
          $subdir = substr($helper->{VARS}->{'filename'},
 , rindex($helper->{VARS}->{'filename'}, '/') + 1);
      } else {
-         ($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'} =
+ 		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+ 	} else {
+ 	    $url = $helper->{VARS}->{'postdata'};
+ 	    $is_published=1;	# From resource space.
+ 	}
+ 	$url = &Apache::lonnet::clutter($url);
          if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
              my $postdata = $helper->{VARS}->{'postdata'};
- Line 1765  sub printHelper {
+ Line 2607  sub printHelper {
  	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
      }
      if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
- 	$helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
+ 	$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
      }
      my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
-     my $userPriviledged = ($env{'request.role'}=~m/^cc\./ or
- 			   $env{'request.role'}=~m/^in\./ or
- 			   $env{'request.role'}=~m/^ta\./);
      Apache::lonhelper::registerHelperTags();
      # "Delete everything after the last slash."
      $subdir =~ s|/[^/]+$||;
-     if (not $helper->{VARS}->{'construction'}) {
- 	$subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;
-     }
-     # "Remove all duplicate slashes."
-     $subdir =~ s|/+|/|g;
      # What can be printed is a very dynamic decision based on
      # lots of factors. So we need to dynamically build this list.
- Line 1798  sub printHelper {
+ Line 2632  sub printHelper {
      my $paramHash;
      if ($resourceTitle) {
-         push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('what you just saw on the screen').")", 'current_document', 'PAGESIZE'];
+         push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
      }
      # Useful filter strings
- Line 1813  sub printHelper {
+ Line 2647  sub printHelper {
      $helper->declareVar('SEQUENCE');
-     # Useful for debugging: Dump the help vars
- #    $r->print(Dumper($helper->{VARS}));
- #    $r->print($map);
      # If we're in a sequence...
-     if (($helper->{'VARS'}->{'construction'} ne '1') &&
+     my $start_new_option;
+     if ($perm{'pav'}) {
+ 	$start_new_option =
+ 	    "<option text='".&mt('Start new page<br />before selected').
+ 	    "' variable='FINISHPAGE' />";
+     }
+     if (($helper->{'VARS'}->{'construction'} ne '1' ) &&
  	$helper->{VARS}->{'postdata'} &&
  	$helper->{VARS}->{'assignment'}) {
          # Allow problems from sequence
-         push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+         push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
          # Allow all resources from sequence
-         push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+         push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
          my $helperFragment = <<HELPERFRAGMENT;
    <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
-     <message>(mark them then click "next" button) <br /></message>
      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
                closeallpages="1">
        <nextstate>PAGESIZE</nextstate>
        <filterfunc>return $isProblem;</filterfunc>
        <mapurl>$map</mapurl>
        <valuefunc>return $symbFilter;</valuefunc>
-       <option text='Newpage' variable='FINISHPAGE' />
+       $start_new_option
        </resource>
      </state>
    <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
-     <message>(mark them then click "next" button) <br /></message>
      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
                closeallpages="1">
        <nextstate>PAGESIZE</nextstate>
        <filterfunc>return $isNotMap;</filterfunc>
        <mapurl>$map</mapurl>
        <valuefunc>return $symbFilter;</valuefunc>
-       <option text='Newpage' variable='FINISHPAGE' />
+       $start_new_option
        </resource>
      </state>
  HELPERFRAGMENT
- Line 1856  HELPERFRAGMENT
+ Line 2692  HELPERFRAGMENT
  	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
      }
-     # If the user is privileged, allow them to print all
+     # If the user has pfo (print for otheres) allow them to print all
      # problems and resources  in the entier course, optionally for selected students
-     if ($userPriviledged &&
+     if ($perm{'pfo'} &&  !$is_published  &&
          ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
-         push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
- 	push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
+ 	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
           &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
    <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
-     <message>(mark them then click "next" button) <br /></message>
      <resource variable="RESOURCES" toponly='0' multichoice="1"
  	suppressEmptySequences='0' addstatus="1" closeallpages="1">
        <nextstate>PAGESIZE</nextstate>
        <filterfunc>return $isProblemOrMap;</filterfunc>
        <choicefunc>return $isNotMap;</choicefunc>
        <valuefunc>return $symbFilter;</valuefunc>
-       <option text='Newpage' variable='FINISHPAGE' />
+       $start_new_option
      </resource>
    </state>
    <state name="ALL_RESOURCES" title="Select Resource(s) to print">
-     <message>(Mark them then click "next" button) <br /> </message>
      <resource variable="RESOURCES" toponly='0' multichoice='1'
                suppressEmptySequences='0' addstatus='1' closeallpages='1'>
        <nextstate>PAGESIZE</nextstate>
        <filterfunc>return $isNotMap; </filterfunc>
        <valuefunc>return $symbFilter;</valuefunc>
-       <option text='NewPage' variable='FINISHPAGE' />
+       $start_new_option
      </resource>
    </state>
  ALL_PROBLEMS
  	if ($helper->{VARS}->{'assignment'}) {
- 	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
+ 	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
- 	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'problems_for_anon', 'CHOOSE_ANON1'];
+ 	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
  	}
+ 	my $randomly_ordered_warning =
+ 	    &get_randomly_ordered_warning($helper,$map);
+ 	# resource_selector will hold a few states that:
+ 	#   - Allow resources to be selected for printing.
+ 	#   - Determine pagination between assignments.
+ 	#   - Determine how many assignments should be bundled into a single PDF.
+         # TODO:
+ 	#    Probably good to do things like separate this up into several vars, each
+ 	#    with one state, and use REGEXPs at inclusion time to set state names
+ 	#    and next states for better mix and match capability
+ 	#
  	my $resource_selector=<<RESOURCE_SELECTOR;
+     <state name="SELECT_PROBLEMS" title="Select resources to print">
+     $randomly_ordered_warning
+    <nextstate>PRINT_FORMATTING</nextstate>
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
      <resource variable="RESOURCES" multichoice="1" addstatus="1"
                closeallpages="1">
        <filterfunc>return $isProblem;</filterfunc>
        <mapurl>$map</mapurl>
        <valuefunc>return $symbFilter;</valuefunc>
-       <option text='New Page' variable='FINISHPAGE' />
+       $start_new_option
        </resource>
+     </state>
+     <state name="PRINT_FORMATTING" title="How should results be printed?">
      <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
      <choices variable="EMPTY_PAGES">
        <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
- Line 1907  ALL_PROBLEMS
+ Line 2760  ALL_PROBLEMS
        <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>
-     <message><hr width='33%' /><b>Number of assignments printed at the same time: </b></message>
+     <nextstate>PAGESIZE</nextstate>
-     <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+     <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
+     <choices variable="SPLIT_PDFS">
+        <choice computer="all">All assignments in a single PDF file</choice>
+        <choice computer="sections">Each PDF contains exactly one section</choice>
+        <choice computer="oneper">Each PDF contains exactly one assignment</choice>
+        <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+             Specify the number of assignments per PDF:</choice>
+     </choices>
+     </state>
  RESOURCE_SELECTOR
          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
    <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
-       <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1"/>
+       <message><b>Select sorting order of printout</b> </message>
-       <message><b>Select sort order</b> </message>
      <choices variable='student_sort'>
        <choice computer='0'>Sort by section then student</choice>
        <choice computer='1'>Sort by students across sections.</choice>
      </choices>
-     $resource_selector
+       <message><br /><hr /><br /> </message>
+       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
    </state>
+     $resource_selector
  CHOOSE_STUDENTS
  	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 1929  CHOOSE_STUDENTS
+ Line 2791  CHOOSE_STUDENTS
  	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 %codes_to_print;
+ 	foreach my $key (@names) {
+ 	    %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);
+ 	    foreach my $key (keys(%code_values)) {
+ 		$codes_to_print{$key} = 1;
+ 	    }
+ 	}
+ 	my $code_selection;
+ 	foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
+ 	    my $choice  = $code;
+ 	    if ($code =~ /^[A-Z]+$/) { # Alpha code
+ 		$choice = &letters_to_num($code);
+ 	    }
+ 	    push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
+ 	}
+ 	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">
+                   <choice></choice>
+                   <exec>
+                      push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+                   </exec>
+ 		</dropdown>
+ 	    <message></td></tr><tr><td></message>
+             '.$/;
+ 	}
+ 	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+ 	my $codechoice='';
+ 	foreach my $line (<FH>) {
+ 	    my ($name,$description,$code_type,$code_length)=
+ 		(split(/:/,$line))[0,1,2,4];
+ 	    if ($code_length > 0 &&
+ 		$code_type =~/^(letter|number|-1)/) {
+ 		$codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';
+ 	    }
+ 	}
+ 	if ($codechoice eq '') {
+ 	    $codechoice='<choice computer="default">Default</choice>';
+ 	}
          &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
-   <state name="CHOOSE_ANON1" title="Select Students and Resources">
+   <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">
-     <nextstate>PAGESIZE</nextstate>
+     <nextstate>SELECT_PROBLEMS</nextstate>
-     <message><hr width='33%' /></message>
+     <message><h4>Fill out one of the forms below</h4></message>
-     <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></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">
         <validator>
  	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
- 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+ 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
+ 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
  	    return "You need to specify the number of assignments to print";
  	}
  	return undef;
         </validator>
      </string>
      <message></td></tr><tr><td></message>
-     <message><b>Names to store the CODEs under for later:</b></message>
+     <message><b>Names to save the CODEs under for later:</b></message>
      <message></td><td></message>
      <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+     <message></td></tr><tr><td></message>
+     <message><b>Bubble sheet type:</b></message>
+     <message></td><td></message>
+     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+     $codechoice
+     </dropdown>
+     <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
+     <message></td></tr><tr><td></table></message>
+     <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+     <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+     <string variable="SINGLE_CODE" size="10">
+         <validator>
+ 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+ 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
+ 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+ 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+ 						      \$helper->{'VARS'}{'CODE_OPTION'});
+ 	   } else {
+ 	       return undef;	# Other forces control us.
+ 	   }
+         </validator>
+     </string>
+     <message></td></tr><tr><td></message>
+         $code_selection
      <message></td></tr></table></message>
-     <message><hr width='33%' /></message>
+     <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
-     <message><b>Reprint a set of saved CODEs:</b></message>
+     <message><b>Select saved CODEs:</b></message>
+     <message></td><td></message>
      <dropdown variable="REUSE_OLD_CODES">
          $namechoice
      </dropdown>
-     <message><hr width='33%' /></message>
+     <message></td></tr></table></message>
-     $resource_selector
    </state>
+   $resource_selector
  CHOOSE_ANON1
  	if ($helper->{VARS}->{'assignment'}) {
- 	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
+ 	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
- 	    push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'resources_for_anon', 'CHOOSE_ANON2'];
+ 	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
  	}
  	$resource_selector=<<RESOURCE_SELECTOR;
+     <state name="SELECT_RESOURCES" title="Select Resources">
+     $randomly_ordered_warning
+     <nextstate>PRINT_FORMATTING</nextstate>
      <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
      <resource variable="RESOURCES" multichoice="1" addstatus="1"
                closeallpages="1">
        <filterfunc>return $isNotMap;</filterfunc>
        <mapurl>$map</mapurl>
        <valuefunc>return $symbFilter;</valuefunc>
-       <option text='Newpage' variable='FINISHPAGE' />
+       $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>
- Line 1983  CHOOSE_ANON1
+ Line 2930  CHOOSE_ANON1
        <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>
-     <message><hr width='33%' /><b>Number of assignments printed at the same time: </b></message>
+     <nextstate>PAGESIZE</nextstate>
-     <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+     <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);
    <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
-     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1" />
      <choices variable='student_sort'>
        <choice computer='0'>Sort by section then student</choice>
        <choice computer='1'>Sort by students across sections.</choice>
      </choices>
+     <message><br /><hr /><br /></message>
+     <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
-     $resource_selector
      </state>
+     $resource_selector
  CHOOSE_STUDENTS1
  	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
-   <state name="CHOOSE_ANON2" title="Select Students and Resources">
+   <state name="CHOOSE_ANON2" title="Select CODEd Assignments">
-     <nextstate>PAGESIZE</nextstate>
+     <nextstate>SELECT_RESOURCES</nextstate>
-     <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
+     <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">
         <validator>
  	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
- 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+ 	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+ 	    !\$helper->{'VARS'}{'SINGLE_CODE'}                   &&
+ 	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
  	    return "You need to specify the number of assignments to print";
  	}
  	return undef;
         </validator>
      </string>
      <message></td></tr><tr><td></message>
-     <message><b>Names to store the CODEs under for later:</b></message>
+     <message><b>Names to save the CODEs under for later:</b></message>
      <message></td><td></message>
      <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+     <message></td></tr><tr><td></message>
+     <message><b>Bubble sheet type:</b></message>
+     <message></td><td></message>
+     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+     $codechoice
+     </dropdown>
+     <message></td></tr><tr><td></table></message>
+     <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+     <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+     <string variable="SINGLE_CODE" size="10">
+         <validator>
+ 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+ 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
+ 	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+ 	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+ 						      \$helper->{'VARS'}{'CODE_OPTION'});
+ 	   } else {
+ 	       return undef;	# Other forces control us.
+ 	   }
+         </validator>
+     </string>
+     <message></td></tr><tr><td></message>
+         $code_selection
      <message></td></tr></table></message>
-     <message><hr width='33%' /></message>
+     <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
-     <message><b>Reprint a set of saved CODEs:</b></message>
+     <message><b>Select saved CODEs:</b></message>
+     <message></td><td></message>
      <dropdown variable="REUSE_OLD_CODES">
          $namechoice
      </dropdown>
-     <message><hr width='33%' /></message>
+     <message></td></tr></table></message>
-     $resource_selector
    </state>
+     $resource_selector
  CHOOSE_ANON2
      }
      # FIXME: That RE should come from a library somewhere.
-     if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $env{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {
+     if (($perm{'pav'}
-         push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+ 	&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
+ 	&& (defined($helper->{'VARS'}->{'construction'})
+ 	    ||
+ 	    (&Apache::lonnet::allowed('bre',$subdir) eq 'F'
+ 	     &&
+ 	     $helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
+ 	    ))
+ 	&& $helper->{VARS}->{'assignment'} eq ""
+ 	) {
-         my $f = '$filename';
+ 	my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
+         push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
          my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
-   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
+   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
-     <message>(mark them then click "next" button) <br /></message>
      <files variable="FILES" multichoice='1'>
        <nextstate>PAGESIZE</nextstate>
        <filechoice>return '$subdir';</filechoice>
- Line 2055  CHOOSE_FROM_SUBDIR
+ Line 3049  CHOOSE_FROM_SUBDIR
      # Allow the user to select any sequence in the course, feed it to
      # another resource selector for that sequence
-     if (!$helper->{VARS}->{'construction'}) {
+     if (!$helper->{VARS}->{'construction'} && !$is_published) {
- 	push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> in course",
+ 	push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
  			      'select_sequences', 'CHOOSE_SEQUENCE'];
  	my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
  	#Escape apostrophes and backslashes for Perl
- Line 2069  CHOOSE_FROM_SUBDIR
+ Line 3063  CHOOSE_FROM_SUBDIR
        <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
        <filterfunc>return \$res->is_sequence;</filterfunc>
        <valuefunc>return $urlValue;</valuefunc>
-       <option text='Newpage' variable='FINISHPAGE' />
+       <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
+ 	</choicefunc>
        </resource>
      </state>
    <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
- Line 2077  CHOOSE_FROM_SUBDIR
+ Line 3072  CHOOSE_FROM_SUBDIR
      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
                closeallpages="1">
        <nextstate>PAGESIZE</nextstate>
-       <filterfunc>return $isProblem</filterfunc>
+       <filterfunc>return $isNotMap</filterfunc>
        <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
        <valuefunc>return $symbFilter;</valuefunc>
-       <option text='Newpage' variable='FINISHPAGE' />
+       $start_new_option
        </resource>
      </state>
  CHOOSE_FROM_ANY_SEQUENCE
- Line 2099  CHOOSE_FROM_ANY_SEQUENCE
+ Line 3094  CHOOSE_FROM_ANY_SEQUENCE
      my $startedTable = 0; # have we started an HTML table yet? (need
                            # to close it later)
-     if (($env{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or
+     if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or
  	($helper->{VARS}->{'construction'} eq '1')) {
- 	addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
+ 	addMessage("<hr width='33%' /><table><tr><td align='right'>".
+                    '<label for="ANSWER_TYPE_forminput">'.
+                    &mt('Print').
+                    "</label>: </td><td>");
          $paramHash = Apache::lonhelper::getParamHash();
  	$paramHash->{'variable'} = 'ANSWER_TYPE';
  	$helper->declareVar('ANSWER_TYPE');
- Line 2115  CHOOSE_FROM_ANY_SEQUENCE
+ Line 3113  CHOOSE_FROM_ANY_SEQUENCE
  	$startedTable = 1;
      }
-     if ($env{'request.role.adv'}) {
+     if ($perm{'pav'}) {
  	if (!$startedTable) {
- 	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
+ 	    addMessage("<hr width='33%' /><table><tr><td align='right'>".
+                        '<label for="LATEX_TYPE_forminput">'.
+                        &mt('LaTeX mode').
+                        "</label>: </td><td>");
  	    $startedTable = 1;
  	} else {
- 	    addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
+ 	    addMessage("<tr><td align='right'>".
+                        '<label for="LATEX_TYPE_forminput">'.
+                         &mt('LaTeX mode').
+                        "</label>: </td><td>");
  	}
          $paramHash = Apache::lonhelper::getParamHash();
  	$paramHash->{'variable'} = 'LATEX_TYPE';
- Line 2136  CHOOSE_FROM_ANY_SEQUENCE
+ Line 3140  CHOOSE_FROM_ANY_SEQUENCE
  	}
          Apache::lonhelper::dropdown->new();
- 	addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
+ 	addMessage("</td></tr><tr><td align='right'>".
+                    '<label for="TABLE_CONTENTS_forminput">'.
+                    &mt('Print Table of Contents').
+                    "</label>: </td><td>");
          $paramHash = Apache::lonhelper::getParamHash();
  	$paramHash->{'variable'} = 'TABLE_CONTENTS';
  	$helper->declareVar('TABLE_CONTENTS');
- Line 2147  CHOOSE_FROM_ANY_SEQUENCE
+ Line 3154  CHOOSE_FROM_ANY_SEQUENCE
  	addMessage("</td></tr>");
  	if (not $helper->{VARS}->{'construction'}) {
- 	    addMessage("<tr><td align='right'>Print Index: </td><td>");
+ 	    addMessage("<tr><td align='right'>".
+                        '<label for="TABLE_INDEX_forminput">'.
+                        &mt('Print Index').
+                        "</label>: </td><td>");
  	    $paramHash = Apache::lonhelper::getParamHash();
  	    $paramHash->{'variable'} = 'TABLE_INDEX';
  	    $helper->declareVar('TABLE_INDEX');
- Line 2156  CHOOSE_FROM_ANY_SEQUENCE
+ Line 3166  CHOOSE_FROM_ANY_SEQUENCE
  				     ['Yes', 'yes'] ];
  	    Apache::lonhelper::dropdown->new();
  	    addMessage("</td></tr>");
- 	    addMessage("<tr><td align='right'>Print Discussions: </td><td>");
+ 	    addMessage("<tr><td align='right'>".
+                        '<label for="PRINT_DISCUSSIONS_forminput">'.
+                        &mt('Print Discussions').
+                        "</label>: </td><td>");
  	    $paramHash = Apache::lonhelper::getParamHash();
  	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';
  	    $helper->declareVar('PRINT_DISCUSSIONS');
- Line 2166  CHOOSE_FROM_ANY_SEQUENCE
+ Line 3179  CHOOSE_FROM_ANY_SEQUENCE
  	    Apache::lonhelper::dropdown->new();
  	    addMessage("</td></tr>");
-             #  If advanced roles, then allow to show all foils.
+ 	    # Prompt for printing annotations too.
-             if ($env{'request.role.adv'}) {
+ 	    addMessage("<tr><td align='right'>".
- 		addMessage("<tr><td align = 'right'>  </td><td>");
+ 		       '<label for="PRINT_ANNOTATIONS_forminput">'.
- 		$paramHash = Apache::lonhelper::getParamHash();
+ 		       &mt('Print Annotations').
- 		$paramHash->{'multichoice'} = "true";
+ 		       "</label>:</td><td>");
- 		$paramHash->{'allowempty'}  = "true";
+ 	    $paramHash = Apache::lonhelper::getParamHash();
- 		$paramHash->{'variable'}   = "showallfoils";
+ 	    $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
- 		$paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+ 	    $helper->declareVar("PRINT_ANNOTATIONS");
- 		Apache::lonhelper::choices->new();
+ 	    $paramHash->{CHOICES} = [
- 		addMessage("</td></tr>");
+ 				     ['No', 'no'],
-             }
+ 				     ['Yes', 'yes']];
+ 	    Apache::lonhelper::dropdown->new();
+ 	    addMessage("</td></tr>");
+ 	    addMessage("<tr><td align = 'right'>  </td><td>");
+ 	    $paramHash = Apache::lonhelper::getParamHash();
+ 	    $paramHash->{'multichoice'} = "true";
+ 	    $paramHash->{'allowempty'}  = "true";
+ 	    $paramHash->{'variable'}   = "showallfoils";
+ 	    $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+ 	    Apache::lonhelper::choices->new();
+ 	    addMessage("</td></tr>");
  	}
  	if ($helper->{'VARS'}->{'construction'}) {
- 	    my $stylevalue=$env{'construct.style'};
+ 	    my $stylevalue='$Apache::lonnet::env{"construct.style"}';
+             my $randseedtext=&mt("Use random seed");
+             my $stylefiletext=&mt("Use style file");
+             my $selectfiletext=&mt("Select style file");
  	    my $xmlfrag .= <<"RNDSEED";
- 	    <message><tr><td align='right'>Use random seed:  </td><td></message>
+ 	    <message><tr><td align='right'>
+             <label for="curseed_forminput">$randseedtext</label>:
+             </td><td></message>
  	    <string variable="curseed" size="15" maxlength="15">
  		<defaultvalue>
  	            return $helper->{VARS}->{'curseed'};
  	        </defaultvalue>
  	    </string>
- 	     <message></td></tr><tr><td align="right">Use style file:</td><td></message>
+ 	     <message></td></tr><tr><td align="right">
-              <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><td></message>
+              <label for="style_file">$stylefiletext</label>:
-              <message></td></tr></message>
+              </td><td></message>
+              <string variable="style_file" size="40">
+ 		<defaultvalue>
+ 	            return $stylevalue;
+ 	        </defaultvalue>
+              </string><message>&nbsp; <a href="javascript:openbrowser('helpform','style_file_forminput','sty')">$selectfiletext</a> </td></tr><tr><td></td><td align="left"></message>
  	     <choices allowempty="1" multichoice="true" variable="showallfoils">
-                 <choice computer="1">Show all foils?</choice>
+                 <choice computer="1">Show all foils</choice>
               </choices>
+ 	     <message></td></tr></message>
  RNDSEED
              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
- 	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
+ 	    addMessage("<tr><td>Problem Type:</td><td>");
+ 	    #
+ 	    # Initial value from construction space:
+ 	    #
+ 	    if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+ 		$helper->{VARS}->{'probstatus'} = $env{'form.problemtype'};	# initial value
+ 	    }
+ 	    $xmlfrag = << "PROBTYPE";
+ 		<dropdown variable="probstatus" multichoice="0" allowempty="0">
+ 		   <defaultvalue>
+ 		      return "$helper->{VARS}->{'probstatus'}";
+                    </defaultvalue>
+ 		   <choice computer="problem">Homework Problem</choice>
+ 		   <choice computer="exam">Exam Problem</choice>
+ 		   <choice computer="survey">Survey question</choice>
+ 		</dropdown>
+ PROBTYPE
+             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
- 	}
+ 	    addMessage("</td></tr>");
+ 	}
      }
- Line 2221  RNDSEED
+ Line 3276  RNDSEED
      $helper->process();
      # MANUAL BAILOUT CONDITION:
      # If we're in the "final" state, bailout and return to handler
      if ($helper->{STATE} eq 'FINAL') {
- Line 2228  RNDSEED
+ Line 3284  RNDSEED
      }
      $r->print($helper->display());
+     if ($helper->{STATE} eq 'START') {
+ 	&recently_generated($r);
+     }
      &Apache::lonhelper::unregisterHelperTags();
      return OK;
- Line 2271  use Apache::lonlocal;
+ Line 3329  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 = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
-                  "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
+ 		 "a4 [210x297 mm]");
-                  "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]",
-                  "a5 [148x210 mm]", "a6 [105x148 mm]" );
  # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
  #                   Paper type
- Line 2299  sub render {
+ Line 3360  sub render {
      my $PageLayout=&mt('Page layout');
      my $NumberOfColumns=&mt('Number of columns');
      my $PaperType=&mt('Paper type');
+     my $landscape=&mt('Landscape');
+     my $portrait=&mt('Portrait');
      $result .= <<STATEHTML;
  <hr width="33%" />
- Line 2310  sub render {
+ Line 3373  sub render {
    </tr>
    <tr>
      <td>
-       <input type="radio" name="${var}.layout" value="L" /> Landscape<br />
+       <label><input type="radio" name="${var}.layout" value="L" /> $landscape </label><br />
-       <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait
+       <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> $portrait </label>
      </td>
      <td align="center">
        <select name="${var}.cols">
- Line 2330  STATEHTML
+ Line 3393  STATEHTML
      $result .= "<select name='${var}.paper'>\n";
      my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
-     my $DefaultPaperSize=$parmhash{'default_paper_size'};
+     my $DefaultPaperSize=lc($parmhash{'default_paper_size'});
+     $DefaultPaperSize=~s/\s//g;
      if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
      $i = 0;
      foreach (@paperSize) {
- Line 2405  sub new {
+ Line 3469  sub new {
      # $helper->{VARS} to figure out whether the columns are one or two
      $self->{'formatvar'} = shift;
-     # The state to transition to after selection, or after discovering
-     # the cols are not set to 1
      $self->{NEXTSTATE} = shift;
      bless($self);
      return $self;
  }
- Line 2418  sub render {
+ Line 3482  sub render {
      my $result = '';
      my $var = $self->{'variable'};
      if (defined $self->{ERROR_MSG}) {
-         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
+         $result .= '<br /><span class="LC_error">' . $self->{ERROR_MSG} . '</span><br />';
      }
+     my $format = $helper->{VARS}->{$self->{'formatvar'}};
+     # Use format to get sensible defaults for the margins:
+     my ($laystyle, $cols, $papersize) = split(/\|/, $format);
+     ($papersize)                      = split(/ /, $papersize);
+     if ($laystyle eq 'L') {
+ 	$laystyle = 'album';
+     } else {
+ 	$laystyle = 'book';
+     }
+     my %size;
+     ($size{'width_and_units'},
+      $size{'height_and_units'},
+      $size{'margin_and_units'})=
+ 	 &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
+     foreach my $dimension ('width','height','margin') {
+ 	($size{$dimension},$size{$dimension.'_unit'}) =
+ 	    split(/ +/, $size{$dimension.'_and_units'},2);
+ 	foreach my $unit ('cm','in') {
+ 	    $size{$dimension.'_options'} .= '<option ';
+ 	    if ($size{$dimension.'_unit'} eq $unit) {
+ 		$size{$dimension.'_options'} .= 'selected="selected" ';
+ 	    }
+ 	    $size{$dimension.'_options'} .= '>'.$unit.'</option>';
+ 	}
+     }
+     # Adjust margin for LaTeX margin: .. requires units == cm or in.
+     if ($size{'margin_unit'} eq 'in') {
+ 	$size{'margin'} += 1;
+     }  else {
+ 	$size{'margin'} += 2.54;
+     }
+     my %text = ('format' => 'How should each column be formatted?',
+ 		'width'  => 'Width:',
+ 		'height' => 'Height:',
+ 		'margin' => 'Left Margin:',);
+     %text = &Apache::lonlocal::texthash(%text);
      $result .= <<ELEMENTHTML;
- <p>How should the column be formatted?</p>
+ <p>$text{'format'}</p>
  <table cellpadding='3'>
    <tr>
-     <td align='right'><b>Width</b>:</td>
+     <td align='right'><b>$text{'width'}</b></td>
-     <td align='left'><input type='text' name='$var.width' value='18' size='4'></td>
+     <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
      <td align='left'>
        <select name='$var.widthunit'>
-         <option>cm</option><option>in</option>
+       $size{'width_options'}
        </select>
      </td>
    </tr>
    <tr>
-     <td align='right'><b>Height</b>:</td>
+     <td align='right'><b>$text{'height'}</b></td>
-     <td align='left'><input type='text' name="$var.height" value="25.9" size='4'></td>
+     <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
      <td align='left'>
        <select name='$var.heightunit'>
-         <option>cm</option><option>in</option>
+       $size{'height_options'}
        </select>
      </td>
    </tr>
    <tr>
-     <td align='right'><b>Left margin</b>:</td>
+     <td align='right'><b>$text{'margin'}</b></td>
-     <td align='left'><input type='text' name='$var.lmargin' value='-1.5' size='4'></td>
+     <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
      <td align='left'>
        <select name='$var.lmarginunit'>
-         <option>cm</option><option>in</option>
+       $size{'margin_options'}
        </select>
      </td>
    </tr>
  </table>
- <p>Hint: Some instructors like to leave scratch space for the student by
+ <!--<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>
+ making the width much smaller than the width of the page.</p>-->
  ELEMENTHTML
      return $result;
  }
- # If the user didn't select 1 column, skip this state.
  sub preprocess {
      my $self = shift;
      my $helper = Apache::lonhelper::getHelper();
      my $format = $helper->{VARS}->{$self->{'formatvar'}};
-     if (substr($format, 2, 1) ne '1') {
-         $helper->changeState($self->{NEXTSTATE});
+     #  If the user does not have 'pav' privilege, set default widths and
+     #  on to the next state right away.
+     #
+     if (!$perm{'pav'}) {
+ 	my $var = $self->{'variable'};
+ 	my $format = $helper->{VARS}->{$self->{'formatvar'}};
+ 	my ($laystyle, $cols, $papersize) = split(/\|/, $format);
+ 	($papersize)                      = split(/ /, $papersize);
+ 	if ($laystyle eq 'L') {
+ 	    $laystyle = 'album';
+ 	} else {
+ 	    $laystyle = 'book';
+ 	}
+ 	#  Figure out some good defaults for the print out and set them:
+ 	my %size;
+ 	($size{'width'},
+ 	 $size{'height'},
+ 	 $size{'lmargin'})=
+ 	     &Apache::lonprintout::page_format($papersize, $laystyle, $cols);
+ 	foreach my $dim ('width', 'height', 'lmargin') {
+ 	    my ($value, $units) = split(/ /, $size{$dim});
+ 	    $helper->{VARS}->{"$var.".$dim}      = $value;
+ 	    $helper->{VARS}->{"$var.".$dim.'unit'} = $units;
+ 	}
+ 	# Transition to the next state
+ 	$helper->changeState($self->{NEXTSTATE});
      }
      return 1;
- Line 2494  sub postprocess {
+ Line 3643  sub postprocess {
      # /^-?[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 {
+ 	# Adjust for LaTeX 1.0 inch margin:
+ 	if ($env{"form.${var}.lmarginunit"} eq "in") {
+ 	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 1;
+ 	} else {
+ 	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 2.54;
+ 	}
      }
      if (!$error) {

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

Removed from v.1.375
changed lines
	Added in v.1.533