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.312 and 1.495

-version 1.312, 2004/06/28 19:08:22
+version 1.495, 2007/01/15 11:53:50
  Line 1
+ #
  # The LearningOnline Network
  # Printout
  #
- Line 22
+ Line 23
  # 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;
  use Apache::edit;
  use Apache::File();
  use Apache::lonnavmaps;
- use Apache::lonratedt;
+ use LONCAPA::map();
  use POSIX qw(strftime);
  use Apache::lonlocal;
- use GDBM_File;
+ use Carp;
+ use LONCAPA;
+ my %perm;
+ my %parmhash;
+ my $resources_printed;
+ #
+ #   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);
+     }
+ }
+ #   Compare two students by name.  The students are in the form
+ #   returned by the helper:
+ #      user:domain:section:last,   first:status
+ #   This is a helper function for the perl sort built-in  therefore:
+ # Implicit Inputs:
+ #    $a     - The first element to compare (global)
+ #    $b     - The second element to compare (global)
+ # Returns:
+ #   -1   - $a < $b
+ #    0   - $a == $b
+ #   +1   - $a > $b
+ #   Note that the initial comparison is done on the last names with the
+ #   first names only used to break the tie.
+ #
+ #
+ sub compare_names {
+     #  First split the names up into the primary fields.
+     my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
+     my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
+     # Now split the last name and first name of each n:
+     #
+     my ($l1,$f1) = split(/,/, $n1);
+     my ($l2,$f2) = split(/,/, $n2);
+     # We don't bother to remove the leading/trailing whitespace from the
+     # firstname, unless the last names compare identical.
- my %hash;
+     if($l1 lt $l2) {
- my $LaTeXwidth = 0;
+ 	return -1;
+     }
+     if($l1 gt $l2) {
+ 	return  1;
+     }
+     # Break the tie on the first name, but there are leading (possibly trailing
+     # whitespaces to get rid of first
+     #
+     $f1 =~ s/^\s+//;		# Remove leading...
+     $f1 =~ s/\s+$//;		# Trailing spaces from first 1...
+     $f2 =~ s/^\s+//;
+     $f2 =~ s/\s+$//;		# And the same for first 2...
+     if($f1 lt $f2) {
+ 	return -1;
+     }
+     if($f1 gt $f2) {
+ 	return 1;
+     }
+     #  Must be the same name.
+     return 0;
+ }
  sub latex_header_footer_remove {
      my $text = shift;
- Line 54  sub latex_header_footer_remove {
+ Line 341  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;
- Line 164  sub character_chart {
+ Line 490  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 229  sub character_chart {
+ Line 555  sub character_chart {
      $result =~ s/&(\#219|Ucirc);/\\^{U}/g;
      $result =~ s/&(\#220|Uuml);/\\\"{U}/g;
      $result =~ s/&(\#221|Yacute);/\\\'{Y}/g;
-     $result =~ s/&(\#223|szlig);/\\ss/g;
+     $result =~ s/&(\#223|szlig);/{\\ss}/g;
      $result =~ s/&(\#224|agrave);/\\\`{a}/g;
      $result =~ s/&(\#225|aacute);/\\\'{a}/g;
      $result =~ s/&(\#226|acirc);/\\^{a}/g;
- Line 261  sub character_chart {
+ Line 587  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 336  sub character_chart {
+ Line 663  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 369  sub character_chart {
+ Line 697  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;
      return $result;
  }
+                   #width, height, oddsidemargin, evensidemargin, topmargin
+ my %page_formats=
+     ('letter' => {
+ 	 'book' => {
+ 	     '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
+ 	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','1.0 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']
+ 	 },
+ 	 'album' => {
+ 	     '1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
+              '2' => ['6.0 in','7.1 in','-1 in','-1 in','5 in']
+           },
+      },
+      'tabloid' => {
+ 	 'book' => {
+ 	     '1' => ['9.8 in','16 in','-0.57 in','-0.57 in','-0.5 in'],
+ 	     '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => ['16 in','9.8 in','-0.57 in','-0.57 in','-0.5 in'],
+ 	     '2' => ['16 in','4.9 in','-0.57 in','-0.57 in','-0.5 in']
+           },
+      },
+      'executive' => {
+ 	 'book' => {
+ 	     '1' => ['6.8 in','9 in','-0.57 in','-0.57 in','1.2 in'],
+ 	     '2' => ['3.1 in','9 in','-0.57 in','-0.57 in','1.2 in']
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a2' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a3' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a4' => {
+ 	 'book' => {
+ 	     '1' => ['17.6 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm'],
+ 	     '2' => [ '9.1 cm','27.2 cm','-1.397 c,','-2.11 cm','-1.27 cm']
+ 	 },
+ 	 'album' => {
+ 	     '1' => ['21.59 cm','19.558 cm','-1.27 cm','-2.11 cm','0 cm'],
+ 	     '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
+ 	 },
+      },
+      'a5' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      'a6' => {
+ 	 'book' => {
+ 	     '1' => [],
+ 	     '2' => []
+ 	 },
+ 	 'album' => {
+ 	     '1' => [],
+ 	     '2' => []
+           },
+      },
+      );
  sub page_format {
  #
- #Correspondence between $papersize variable and real paper format:
+ #Supported paper format: "Letter [8 1/2x11 in]",      "Legal [8 1/2x14 in]",
- # 0 - "Letter [8 1/2x11 in]"
+ #                        "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
- # 1 - "Legal [8 1/2x14 in]"
+ #                        "A2 [420x594 mm]",           "A3 [297x420 mm]",
- # 2 - "Ledger/Tabloid [11x17 in]"
+ #                        "A4 [210x297 mm]",           "A5 [148x210 mm]",
- # 3 - "Executive [7 1/2x10 in]"
+ #                        "A6 [105x148 mm]"
- # 4 - "A2 [420x594 mm]"
- # 5 - "A3 [297x420 mm]"
- # 6 - "A4 [210x297 mm]"
- # 7 - "A5 [148x210 mm]"
- # 8 - "A6 [105x148 mm]"
  #
      my ($papersize,$layout,$numberofcolumns) = @_;
-     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);
+     return @{$page_formats{$papersize}->{$layout}->{$numberofcolumns}};
-     if ($papersize eq '0') {
- 	if ($layout eq 'book') {
- 	    if ($numberofcolumns == 1) {
- 		$textwidth = '7.1 in';      #'18 cm';
- 		$textheight = '10.2 in';    #'25.9 cm';
- 		$oddoffset = '-0.57 in';
- 		$evenoffset = '-0.57 in';
- 	    } elsif ($numberofcolumns == 2) {
- 		$textwidth = '3.66 in';     #'93 mm';
- 		$textheight = '10.2 in';    #'25.9 cm';
- 		$oddoffset = '-0.57 in';
- 		$evenoffset = '-0.57 in';
- 	    }
- 	} elsif ($layout eq 'album') {
- 	    if ($numberofcolumns eq '1') {
- 		$textwidth = '8.8 in';
- 		$textheight = '6.8 in';
- 		$oddoffset = '-40 pt';
- 		$evenoffset = '-60 pt';
- 	    } elsif ($numberofcolumns == 2) {
- 		$textwidth = '4.4 in';
- 		$textheight = '6.8 in';
- 		$oddoffset = '-0.5 in';
- 		$evenoffset = '-1.5 in';
- 		$topmargin = '3.5 in';
- 	    }
- 	}
- #    } elsif($papersize eq '1') {
- #    } elsif($papersize eq '2') {
- #    } elsif($papersize eq '3'/) {
-     } elsif($papersize eq '6') {
- 	if ($layout eq 'book') {
- 	    if ($numberofcolumns == 1) {
- 		$textwidth = '176 mm';
- 		$textheight = '254 mm';
- 		$oddoffset = '-0.57 in';
- 		$evenoffset = '-0.57 in';
- 	    } elsif ($numberofcolumns == 2) {
- 		$textwidth = '91 mm';
- 		$textheight = '254 mm';
- 		$oddoffset = '-0.57 in';
- 		$evenoffset = '-0.57 in';
- 	    }
- 	} elsif ($layout eq 'album') {
- 	    if ($numberofcolumns eq '1') {
- 		$textwidth = '8.5 in';
- 		$textheight = '7.7 in';
- 		$oddoffset = '-40 pt';
- 		$evenoffset = '-60 pt';
- 	    } elsif ($numberofcolumns == 2) {
- 		$textwidth = '3.9 in';
- 		$textheight = '7.7 in';
- 		$oddoffset = '-40 pt';
- 		$evenoffset = '-60 pt';
- 	    }
- 	}
- #    } elsif($papersize eq '5') {
- #    } elsif($papersize eq '4') {
- #    } elsif($papersize eq '7') {
- #    } elsif($papersize eq '8') {
-     }
-     return $textwidth,$textheight,$oddoffset,$evenoffset,$topmargin;
  }
  sub get_name {
      my ($uname,$udom)=@_;
-     if (!defined($uname)) { $uname=$ENV{'user.name'}; }
+     if (!defined($uname)) { $uname=$env{'user.name'}; }
-     if (!defined($udom)) { $udom=$ENV{'user.domain'}; }
+     if (!defined($udom)) { $udom=$env{'user.domain'}; }
      my $plainname=&Apache::loncommon::plainname($uname,$udom);
      if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
-     $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
+    $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
      return $plainname;
  }
  sub get_course {
      my $courseidinfo;
-     if (defined($ENV{'request.course.id'})) {
+     if (defined($env{'request.course.id'})) {
- 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&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 474  sub get_course {
+ Line 843  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';
      } 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]{$header_text}";
+     } else {
+ 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
+     }
      if ($layout eq 'album') {
- 	my $topmargintoinsert = '';
+ 	    $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 /;
- 	if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
- 	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
      } elsif ($layout eq 'book') {
  	if ($choice ne 'All class print') {
- 	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
+ 	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
  	} else {
- 	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
+ 	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
+ 	}
+ 	if ($papersize eq 'a4') {
+ 	    $text =~ s/(\\begin{document})/$1\\special{papersize=210mm,297mm}/;
  	}
      }
      if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
- Line 518  sub page_cleanup {
+ Line 902  sub page_cleanup {
  sub details_for_menu {
+     my ($helper)=@_;
+     my $postdata=$env{'form.postdata'};
+     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 $name_of_resourse = &Apache::lonnet::gettitle($ENV{'form.postdata'});
-     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
      my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
      $map=&Apache::lonnet::clutter($map);
      my $name_of_sequence = &Apache::lonnet::gettitle($map);
- Line 528  sub details_for_menu {
+ Line 916  sub details_for_menu {
  	$map =~ m|([^/]+)$|;
  	$name_of_sequence = $1;
      }
-     my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'});
+     my $name_of_map = &Apache::lonnet::gettitle($env{'request.course.uri'});
      if ($name_of_map =~ /^\s*$/) {
- 	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
+ 	$env{'request.course.uri'} =~ m|([^/]+)$|;
  	$name_of_map = $1;
      }
-     return ($name_of_resourse,$name_of_sequence,$name_of_map);
+     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) = @_;
  #    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+     my $copyright = &copyright_line();
+     if ($selectionmade eq '1' || $answer_mode eq 'only') {
+ 	$result =~ s/(\\end{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
+     } else {
+ 	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
+     }
      $result =~ s/\$number_of_columns/$number_of_columns/g;
-     $result =~ 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{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 555  sub latex_corrections {
+ Line 949  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;
- 	$result =~ s/\\\\\s+\[/ \[/g;
+     $result =~ s/\\\\\s+\[/ \[/g;
-     $result =~ s/\b__+\b/\\makebox\[1 cm\]\[b\]{\\hrulefill}/g;
      #conversion of html characters to LaTeX equivalents
      if ($result =~ m/&(\w+|#\d+);/) {
  	$result = &character_chart($result);
      }
      $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
      $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
      return $result;
  }
- Line 602  sub IndexCreation {
+ Line 995  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') {
+     if (($mode eq 'batchmode') || (!$perm{'pav'})) {
  	$output.='\batchmode';
      }
-     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'.
+     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
- 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'.
+    	    '\usepackage{multirow}'."\n".
- 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}\usepackage{calc}'.
+ 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
- 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'.
+ 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
- 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'.
+ 	     '\usepackage{wrapfig}'.
- 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'.
+ 	     '\usepackage{picins}\usepackage{calc}'."\n".
- 	     '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'.
+ 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
- 	     '\setlength{\abovedisplayshortskip}{-0.04in}'.
+ 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
- 	     '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
+ 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
- 	     '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'.
+ 	     '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'."\n".
- 	     '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'.
+ 	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
- 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'.
+ 	     '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'."\n".
- 	     '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'.
+ 	     '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'."\n".
- 	     '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'.
+ 	     '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'."\n".
- 	     '\setlength{\abovedisplayshortskip}{-0.04in}'.
+ 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'."\n".
- 	     '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}';
+ 	     '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'."\n".
+ 	     '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'."\n".
+ 	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
+ 	     '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}'."\n";
      return $output;
  }
  sub path_to_problem {
-     my ($urlp,$LaTeXwidth)=@_;
+     my ($urlp,$colwidth)=@_;
+     $urlp=&Apache::lonnet::clutter($urlp);
      my $newurlp = '';
-     $LaTeXwidth=~s/\s*mm\s*$//;
+     $colwidth=~s/\s*mm\s*$//;
-     my $HowMany = length($urlp)*2;
+ #characters average about 2 mm in width
-     if ($HowMany > $LaTeXwidth) {
+     if (length($urlp)*2 > $colwidth) {
- 	my @temporrary = split '/',$urlp;
+ 	my @elements = split('/',$urlp);
- 	my $HowManyNew = 0;
+ 	my $curlength=0;
- 	for (my $ii=0;$ii<=$#temporrary;$ii++) {
+ 	foreach my $element (@elements) {
- 	    if ($temporrary[$ii] ne '') {
+ 	    if ($element eq '') { next; }
- 		$HowManyNew += length($temporrary[$ii])*2;
+ 	    if ($curlength+(length($element)*2) > $colwidth) {
- 		if ($HowManyNew < $LaTeXwidth ) {
+ 		$newurlp .=  '|\vskip -1 mm \verb|';
- 		    $newurlp .=  '/'.$temporrary[$ii];
+ 		$curlength=length($element)*2;
- 		} else {
+ 	    } else {
- 		    $HowManyNew = 0;
+ 		$curlength+=length($element)*2;
- 		    $newurlp .=  '|\vskip -1 mm \noindent \verb|';
- 		    $ii--;
- 		}
  	    }
+ 	    $newurlp.='/'.$element;
  	}
      } else {
  	$newurlp=$urlp;
- Line 654  sub path_to_problem {
+ Line 1050  sub path_to_problem {
  sub recalcto_mm {
      my $textwidth=shift;
      my $LaTeXwidth;
-     if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
+     if ($textwidth=~/(-?\d+\.?\d*)\s*cm/) {
  	$LaTeXwidth = $1*10;
-     } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
+     } elsif ($textwidth=~/(-?\d+\.?\d*)\s*mm/) {
  	$LaTeXwidth = $1;
-     } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
+     } elsif ($textwidth=~/(-?\d+\.?\d*)\s*in/) {
  	$LaTeXwidth = $1*25.4;
      }
      $LaTeXwidth.=' mm';
- Line 678  sub get_textwidth {
+ Line 1074  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 691  sub unsupported {
+ Line 1090  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:
+ #    helper   - reference to helper object.
+ #  Outputs
+ #    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=&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)$/)) {
+ 		#  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=&Apache::lonnet::ssi($urlp,%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 $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
+     $resources_printed = '';
-     $r->print(<<ENDPART);
+     my $js = <<ENDPART;
- <html>
+ <script type="text/javascript">
- <script type="text/javascript" language="Javascript" >
      var editbrowser;
      function openbrowser(formname,elementname,only,omit) {
          var url = '/res/?';
- Line 721  sub output_data {
+ Line 1290  sub output_data {
          editbrowser.focus();
      }
  </script>
- <head>
- <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.
+     $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
+     $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'};
+     &Apache::loncommon::store_course_settings('print',
+ 					      {'pagebreaks'    => 'scalar',
+ 					       'lastprinttype' => 'scalar'});
+     my %page_breaks  = &get_page_breaks($helper);
      my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
      my ($result,$selectionmade) = ('','');
      my $number_of_columns = 1; #used only for pages to determine the width of the cell
- Line 739  ENDPART
+ Line 1320  ENDPART
  	$laystyle='book';
      }
      my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
-     my $assignment =  $ENV{'form.assignment'};
+     my $assignment =  $env{'form.assignment'};
      my $LaTeXwidth=&recalcto_mm($textwidth);
      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
+     # here.
+     #
+     my %form;
+     $form{'grade_target'} = 'tex';
+     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+     # If form.showallfoils is set, then request all foils be shown:
+     # privilege will be enforced both by not allowing the
+     # check box selecting this option to be presnt unless it's ok,
+     # and by lonresponse's priv. check.
+     # The if is here because lonresponse.pm only cares that
+     # showallfoils is defined, not what the value is.
+     if ($helper->{'VARS'}->{'showallfoils'} eq "1") {
+ 	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
+     }
      if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
        #-- single document - problem, page, html, xml, ...
- 	my $currentURL;
+ 	my ($currentURL,$cleanURL);
  	if ($helper->{'VARS'}->{'construction'} ne '1') {
              #prints published resource
  	    $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 ($currentURL=~/\.(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'}=$currentURL;
+ 		$moreenv{'request.filename'}=$cleanURL;
  		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
  		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
- 		    my $dom = $ENV{'user.domain'};
+ 		    my $dom = $env{'user.domain'};
- 		    my $user = $ENV{'user.name'};
+ 		    my $user = $env{'user.name'};
  		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
  		}
- 		my %form;
                  if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
- 		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- Line 782  ENDPART
+ Line 1384  ENDPART
  		}
  		$form{'rndseed'}=$rndseed;
  		&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);
- 		&Apache::lonnet::delenv('form.counter');
+ 		&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')) {
- 		my %form;
+ 		$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);
  		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'});
- 			$texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
+ 			$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=$currentURL;
+ 			my $URLpath=$cleanURL;
  			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
  			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
  		    }
- Line 822  ENDPART
+ Line 1437  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') {
+ 	    }
- 			my %form;
+ 	    # End construction space sequence.
- 			$form{'grade_target'}='tex';
+ 	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- 			$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
- 			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
- 			$form{'suppress_tries'}=$parmhash{'suppress_tries'};
- 			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- 			$form{'rndseed'}=$rndseed;
- 			$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)$/)) {
- 			my %form;
- 			$form{'grade_target'}='answer';
- 			$form{'answer_output_mode'}='tex';
- 			$form{'rndseed'}=$rndseed;
-                         if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
- 			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\} /;}
- 	    $result .= '\end{document}';
- 	} elsif ($currentURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- 		my %form;
- 		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
+ 		$resources_printed .= $currentURL.':';
  		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
  		$result .= $texversion;
  	} 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
+     } 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_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') {
- Line 905  ENDPART
+ Line 1471  ENDPART
  	    $selectionmade = 3;
  	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
  	    $selectionmade = 4;
+ 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
+ 	    $selectionmade = 4;
  	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
  	    $selectionmade = 7;
  	}
- 	my %form=();
- 	$form{'grade_target'}='tex';
- 	$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
  	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
  	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- Line 920  ENDPART
+ Line 1485  ENDPART
  	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++) {
- 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+ 	    # Note due to document structure, not allowed to put \newpage
+ 	    # prior to the first resource
+ 	    if (defined $page_breaks{$master_seq[$i]}) {
+ 		if($i != 0) {
+ 		    $result.="\\newpage\n";
+ 		}
+ 	    }
+ 	    my ($sequence,undef,$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;}
- 	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
  	    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.':';
+ 		&Apache::lonxml::remember_problem_counter();
  		$texversion.=&Apache::lonnet::ssi($urlp,%form);
  		if ($urlp=~/\.page$/) {
  		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
- Line 940  ENDPART
+ Line 1519  ENDPART
  		    $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')) {
- 		    my %form;
+ 		    #  Don't permanently pervert the %form hash
- 		    $form{'grade_target'}='answer';
+ 		    my %answerform = %form;
- 		    $form{'answer_output_mode'}='tex';
+ 		    $answerform{'grade_target'}='answer';
- 		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+ 		    $answerform{'answer_output_mode'}='tex';
- 		    &Apache::lonnet::appenv(('form.counter' => $current_counter));
+ 		    $resources_printed .= $urlp.':';
+ 		    &Apache::lonxml::restore_problem_counter();
+ 		    my $answer=&Apache::lonnet::ssi($urlp,%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='';
  			}
- Line 979  ENDPART
+ Line 1561  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';
  	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- 		my %form;
- 		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
+ 		$resources_printed .= $urlp.':';
  		my $texversion=&Apache::lonnet::ssi($urlp,%form);
  		if ($flag_latex_header_remove ne 'NO') {
  		    $texversion = &latex_header_footer_remove($texversion);
- Line 998  ENDPART
+ Line 1587  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 1007  ENDPART
+ Line 1597  ENDPART
  		$result .= $texversion;
  		$flag_latex_header_remove = 'YES';
  	    }
+ 	    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}/;}
+ 	if ($flag_page_in_sequence eq 'YES') {
+ 	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+ 	}
  	$result .= '\end{document}';
       } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
  	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
       #-- prints assignments for whole class or for selected students
  	 my $type;
  	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
- Line 1023  ENDPART
+ Line 1618  ENDPART
  	     $type='resources';
  	 }
  	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+ 	 #   The normal sort order is by section then by students within the
+ 	 #   section. If the helper var student_sort is 1, then the user has elected
+ 	 #   to override this and output the students by name.
+ 	 #    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)  &&
+ 	     ($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
  	 my $flag_latex_header_remove = 'NO';
  	 my %moreenv;
+          $moreenv{'instructor_comments'}='hide';
  	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+ 	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
  	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
- 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
+ 	 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";
+              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
  	     if (-e $duefile) {
  		 my $temp_file = Apache::File->new('>>'.$duefile);
  		 print $temp_file "1969\n";
  	     }
  	     $student_counter++;
- 	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
+ 	     if ($split_on_sections) {
- 	     my ($output,$fullname)=&print_resources($r,$helper,$person,$type,\%moreenv,\@master_seq,$flag_latex_header_remove);
+ 		 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,
+ 						     $flag_latex_header_remove,
+ 						     $LaTeXwidth);
+ 	     $resources_printed .= ":";
  	     $print_array[$i].=$output;
  	     $student_names[$i].=$person.':'.$fullname.'_END_';
  	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
  	     $flag_latex_header_remove = 'YES';
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
  	 }
  	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
  	 $result .= $print_array[0].'  \end{document}';
       } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
  	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {
- 	 my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ 	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
- 	 my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ 	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
  	 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 @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ 	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
- 	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+ 	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
- 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
- 	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
+ 	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
- 	     $number_per_page=$num_todo;
+ 	 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 $flag_latex_header_remove = 'NO';
  	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
- 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
+ 	 $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;
+ 	 }
+ 	 my $flag_latex_header_remove = 'NO';
+ 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
  	 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') {
- 	     my ($output,$fullname)=
+ 		 $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);
+ 				  \@master_seq,$flag_latex_header_remove,
+ 				  $LaTeXwidth);
+ 	     $resources_printed .= ":";
  	     $print_array[$file_num].=$output;
  	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
  				       &mt('last assignment').' '.$fullname);
  	     $flag_latex_header_remove = 'YES';
  	     $count++;
+ 	     if (&Apache::loncommon::connection_aborted($r)) { last; }
  	 }
  	 &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
  	 $result .= $print_array[0].'  \end{document}';
- Line 1115  ENDPART
+ Line 1799  ENDPART
  	    my $urlp = $list_of_files[$i];
  	    $urlp=~s|//|/|;
  	    if ($urlp=~/\//) {
- 		my %form;
+ 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
- 		$form{'grade_target'}='tex';
- 		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  		$form{'rndseed'}=$rndseed;
  		if ($urlp =~ m|/home/([^/]+)/public_html|) {
  		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
  		} else {
  		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
  		}
+ 		$resources_printed .= $urlp.':';
  		my $texversion=&Apache::lonnet::ssi($urlp,%form);
  		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
  		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- 		    my %form;
+ 		    #  Don't permanently pervert %form:
- 		    $form{'grade_target'}='answer';
+ 		    my %answerform = %form;
- 		    $form{'answer_output_mode'}='tex';
+ 		    $answerform{'grade_target'}='answer';
- 		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 		    $answerform{'answer_output_mode'}='tex';
- 		    $form{'rndseed'}=$rndseed;
+ 		    $answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- 		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+ 		    $answerform{'rndseed'}=$rndseed;
+ 		    $resources_printed .= $urlp.':';
+ 		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
  		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
  			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
  		    } else {
- Line 1175  ENDPART
+ Line 1860  ENDPART
      }
  #-------------------------------------------------------- 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);
+     $result = &latex_corrections($number_of_columns,$result,$selectionmade,
-     for (my $i=1;$i<=$#print_array;$i++) {$print_array[$i] = &latex_corrections($number_of_columns,$print_array[$i]);}
+ 				 $helper->{'VARS'}->{'ANSWER_TYPE'});
-     #changes page's parameters for the one column output
+     #if ($numberofcolumns == 1) {
-     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/\\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/\\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'} /;
- 	$result =~ s/\\oddsidemargin\s*=\s*\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+     #}
-     }
  #-- 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)) {
  	    $r->log_error("Couldn't open $filename for output $!");
- Line 1203  ENDPART
+ Line 1888  ENDPART
  	    if ($i==0) {
  		$print_array[$i]=$result;
  	    } else {
+ 		$print_array[$i].='\end{document}';
+ 		$print_array[$i] =
+ 		    &latex_corrections($number_of_columns,$print_array[$i],
+ 				       $selectionmade,
+ 				       $helper->{'VARS'}->{'ANSWER_TYPE'});
  		my $anobegin=index($print_array[$i],'\setcounter{page}',0);
  		substr($print_array[$i],0,$anobegin)='';
- 		$print_array[$i]=$inc.$print_array[$i].'\end{document}';
+ 		$print_array[$i]=$inc.$print_array[$i];
  	    }
  	    my $temp_file;
  	    my $newfilename=$filename;
  	    my $num=$i+1;
- 	    $newfilename =~s/\.tex$/_$num\.tex/;
+ 	    $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;
- Line 1227  ENDPART
+ Line 1919  ENDPART
  	if ($#student_names>-1) {
  	    $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_';
  	}
      }
- Line 1237  ENDPART
+ Line 1929  ENDPART
      my $URLback=''; #link to original document
      if ($helper->{'VARS'}->{'construction'} ne '1') {
  	#prints published resource
- 	$URLback=$helper->{'VARS'}->{'postdata'};
+ 	$URLback=&escape('/adm/flip?postdata=return:');
      } else {
  	#prints resource from the construction space
  	$URLback='/'.$helper->{'VARS'}->{'filename'};
- Line 1246  ENDPART
+ Line 1938  ENDPART
  	    $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.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
- 			    'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+ 			    'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
- 			    'cgi.'.$identifier.'role' => $ENV{'request.role.adv'},
+ 			    'cgi.'.$identifier.'.role' => $perm{'pav'},
-                             'cgi.'.$identifier.'numberoffiles' => $#print_array,
+                             'cgi.'.$identifier.'.numberoffiles' => $#print_array,
-                             'cgi.'.$identifier.'studentnames' => $student_names,
+                             'cgi.'.$identifier.'.studentnames' => $student_names,
-                             'cgi.'.$identifier.'backref' => $URLback,);
+                             'cgi.'.$identifier.'.backref' => $URLback,);
+     &Apache::lonnet::appenv("cgi.$identifier.user"    => $env{'user.name'},
- $r->print(<<FINALEND);
+ 			    "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();
+     $r->print(<<FINALEND);
+ <br />
  <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
- </body>
+ <a href="/cgi-bin/printout.pl?$identifier">Continue</a>
- </html>
+ $end_page
  FINALEND
  }
- 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);
+ 	    }
  	}
      }
  }
  sub print_resources {
-     my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header)=@_;
+     my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
+ 	$LaTeXwidth)=@_;
      my $current_output = '';
+     my $printed = '';
      my ($username,$userdomain,$usersection) = split /:/,$person;
      my $fullname = &get_name($username,$userdomain);
+     my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
      if ($person =~ 'anon') {
+ 	$namepostfix .="Name: ";
  	$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}) {
+ 	    if($i != 0) {
+ 		$current_output.= "\\newpage\n";
+ 	    }
+ 	}
+ 	$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/|
- 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
+ 		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
- 		    my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		    $printed .= $curresline.':';
- 		    my $envfile=$ENV{'user.environment'};
- 		    $envfile=~/\/([^\/]+)\.id$/;
+ 		    &Apache::lonxml::remember_problem_counter();
- 		    $envfile=$1;
- 		    &Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
+ 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
- 		    my $current_counter=$ENV{'form.counter'};
  		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
  		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- 			my %form;
+ 			#   Use a copy of the hash so we don't pervert it on future loop passes.
- 			$form{'answer_output_mode'}='tex';
+ 			my %answerenv = %{$moreenv};
- 			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ 			$answerenv{'answer_output_mode'}='tex';
- 			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
+ 			$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- 			&Apache::lonnet::appenv(('form.counter' => $current_counter));
+ 			&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 ($remove_latex_header eq 'YES') {
- Line 1336  sub print_resources {
+ Line 2071  sub print_resources {
  		    }
  		    $current_output .= $rendered;
  		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
+ 		    $printed .= $curresline.':';
- 		    my $lonidsdir=$r->dir_config('lonIDsDir');
+ 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
- 		    my $envfile=$ENV{'user.environment'};
- 		    $envfile=~/\/([^\/]+)\.id$/;
- 		    $envfile=$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 1361  sub print_resources {
+ Line 2093  sub print_resources {
  	    }
  	    $remove_latex_header = 'YES';
  	}
+ 	if (&Apache::loncommon::connection_aborted($r)) { last; }
      }
      my $courseidinfo = &get_course();
      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\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 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\\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 }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
-     }
+ 	$current_output = '\strut\vspace*{-6 mm}\\newline'.
-     return ($current_output,$fullname);
+ 	    &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);
  }
  sub handler {
      my $r = shift;
-     my $helper;
+     &init_perm();
- #    my $loaderror=&Apache::lonnet::overloaderror($r);
+     my $helper = printHelper($r);
- #    if ($loaderror) { return $loaderror; }
+     if (!ref($helper)) {
- #    $loaderror=
+ 	return $helper;
- #       &Apache::lonnet::overloaderror($r,
- #         $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
- #    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 />');
- #	}
- #	return OK;
+     #  If a figure conversion queue file exists for this user.domain
+     # we delete it since it can only be bad (if it were good, printout.pl
+     # would have deleted it the last time around.
+     my $conversion_queuefile = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
+     if(-e $conversion_queuefile) {
+ 	unlink $conversion_queuefile;
+     }
      &output_data($r,$helper,\%parmhash);
      return OK;
  }
- Line 1425  sub addMessage {
+ Line 2164  sub addMessage {
      Apache::lonhelper::message->new();
  }
- use Data::Dumper;
- sub printHelper {
-     my $r = shift;
-     if ($ENV{'request.course.id'}) {
+ sub init_perm {
- 	my $fn=$ENV{'request.course.fn'};
+     undef(%perm);
- 	tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
+     $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 printHelper {
+     my $r = shift;
      if ($r->header_only) {
-         if ($ENV{'browser.mathml'}) {
+         if ($env{'browser.mathml'}) {
              &Apache::loncommon::content_type($r,'text/xml');
          } else {
              &Apache::loncommon::content_type($r,'text/html');
- Line 1446  sub printHelper {
+ Line 2194  sub printHelper {
      }
      # Send header, nocache
-     if ($ENV{'browser.mathml'}) {
+     if ($env{'browser.mathml'}) {
          &Apache::loncommon::content_type($r,'text/xml');
      } else {
          &Apache::loncommon::content_type($r,'text/html');
- Line 1469  sub printHelper {
+ Line 2217  sub printHelper {
      $helper->declareVar('construction');
      $helper->declareVar('assignment');
      $helper->declareVar('style_file');
+     $helper->declareVar('student_sort');
+     $helper->declareVar('FINISHPAGE');
+     $helper->declareVar('PRINT_TYPE');
+     $helper->declareVar("showallfoils");
+     $helper->declareVar("STUDENTS");
+     #  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'});
      # 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:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
+     if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
          $helper->{VARS}->{'filename'} = "~$1/$2";
          $helper->{VARS}->{'construction'} = 1;
      } else {
-         if ($ENV{'form.postdata'}) {
+         if ($env{'form.postdata'}) {
-             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($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'}) {
+         if ($env{'form.symb'}) {
-             $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+             $helper->{VARS}->{'symb'} = $env{'form.symb'};
          }
-         if ($ENV{'form.url'}) {
+         if ($env{'form.url'}) {
              $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
          }
      }
-     if ($ENV{'form.symb'}) {
+     if ($env{'form.symb'}) {
-         $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+         $helper->{VARS}->{'symb'} = $env{'form.symb'};
      }
-     if ($ENV{'form.url'}) {
+     if ($env{'form.url'}) {
          $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
      }
+     $helper->{VARS}->{'symb'}=
-     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+ 	&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
+     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
      if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
- Line 1504  sub printHelper {
+ Line 2287  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 1512  sub printHelper {
+ Line 2296  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'} = Apache::lonnet::clutter($url);
+ 	    ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
+ 	    $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 1521  sub printHelper {
+ Line 2312  sub printHelper {
          }
          $subdir = &Apache::lonnet::filelocation("", $url);
      }
-     if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
+     if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
- 	$helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
+ 	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
      }
-     if (!$helper->{VARS}->{'probstatus'} && $ENV{'form.problemtype'}) {
+     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
- 	$helper->{VARS}->{'probstatus'}=$ENV{'form.problemtype'};
+ 	$helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
      }
      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 1558  sub printHelper {
+ Line 2341  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 1568  sub printHelper {
+ Line 2351  sub printHelper {
      my $isNotMap = '!$res->is_sequence()';
      $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
      my $isMap = '$res->is_map()';
-     my $symbFilter = '$res->symb()';
+     my $symbFilter = '$res->shown_symb()';
-     my $urlValue = '$res->src()';
+     my $urlValue = '$res->link()';
      $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>
+       $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>
+       $start_new_option
        </resource>
      </state>
  HELPERFRAGMENT
-         &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+ 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
      }
-     # If the user is priviledged, allow them to print all
+     # If the user has pfo (print for otheres) allow them to print all
-     # problems in the course, optionally for selected students
+     # 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}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+ 	push @{$printChoices}, ['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>
+       $start_new_option
+     </resource>
+   </state>
+   <state name="ALL_RESOURCES" title="Select Resource(s) to print">
+     <resource variable="RESOURCES" toponly='0' multichoice='1'
+               suppressEmptySequences='0' addstatus='1' closeallpages='1'>
+       <nextstate>PAGESIZE</nextstate>
+       <filterfunc>return $isNotMap; </filterfunc>
+       <valuefunc>return $symbFilter;</valuefunc>
+       $start_new_option
      </resource>
    </state>
  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'];
  	}
+ 	# 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">
+    <nextstate>PRINT_FORMATTING</nextstate>
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
      <resource variable="RESOURCES" multichoice="1" addstatus="1"
                closeallpages="1">
        <filterfunc>return $isProblem;</filterfunc>
        <mapurl>$map</mapurl>
        <valuefunc>return $symbFilter;</valuefunc>
+       $start_new_option
        </resource>
+     </state>
+     <state name="PRINT_FORMATTING" title="How should results be printed?">
      <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
      <choices variable="EMPTY_PAGES">
        <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
- Line 1650  ALL_PROBLEMS
+ Line 2464  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" />
+       <message><b>Select sorting order of printout</b> </message>
-     $resource_selector
+     <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_PROBLEMS" coursepersonnel="1"/>
    </state>
+     $resource_selector
  CHOOSE_STUDENTS
- 	my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ 	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- 	my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ 	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
          my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
  	my $namechoice='<choice></choice>';
- 	foreach my $name (@names) {
+ 	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%' /><b>Number of anonymous assignments to print?</b></message>
+     <message><h4>Fill out one of the forms below</h4></message>
-     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
+     <message><br /><hr /> <br /></message>
-     <message><br /><b>Names to store the CODEs under for later:</b></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'}{'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></td><td></message>
      <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
-     <message><hr width='33%' /></message>
+     <message></td></tr><tr><td></message>
-     <message><b>Reprint a set of saved CODEs:</b></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 /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+     <message><b>Select saved CODEs:</b></message>
+     <message></td><td></message>
      <dropdown variable="REUSE_OLD_CODES">
          $namechoice
      </dropdown>
-     <message><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">
+     <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>
+       $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 1708  CHOOSE_ANON1
+ Line 2632  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" />
+     <choices variable='student_sort'>
-     $resource_selector
+       <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" />
      </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><hr width='33%' /><b>Number of anonymous assignments to print?</b></message>
+     <message><h4>Fill out one of the forms below</h4></message>
-     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
+     <message><br /><hr /> <br /></message>
-     <message><br /><b>Names to store the CODEs under for later:</b></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'}{'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></td><td></message>
      <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
-     <message><hr width='33%' /></message>
+     <message></td></tr><tr><td></message>
-     <message><b>Reprint a set of saved CODEs:</b></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 /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+     <message><b>Select saved CODEs:</b></message>
+     <message></td><td></message>
      <dropdown variable="REUSE_OLD_CODES">
          $namechoice
      </dropdown>
-     <message><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 1764  CHOOSE_FROM_SUBDIR
+ Line 2751  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, ["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 1778  CHOOSE_FROM_SUBDIR
+ Line 2765  CHOOSE_FROM_SUBDIR
        <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
        <filterfunc>return \$res->is_sequence;</filterfunc>
        <valuefunc>return $urlValue;</valuefunc>
+       <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 1785  CHOOSE_FROM_SUBDIR
+ Line 2774  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>
+       $start_new_option
        </resource>
      </state>
  CHOOSE_FROM_ANY_SEQUENCE
- Line 1800  CHOOSE_FROM_ANY_SEQUENCE
+ Line 2790  CHOOSE_FROM_ANY_SEQUENCE
      Apache::lonhelper::message->new();
      $paramHash = Apache::lonhelper::getParamHash();
      $paramHash->{'variable'} = 'PRINT_TYPE';
-     $helper->declareVar('PRINT_TYPE');
      $paramHash->{CHOICES} = $printChoices;
      Apache::lonhelper::choices->new();
      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>");
          $paramHash = Apache::lonhelper::getParamHash();
- Line 1816  CHOOSE_FROM_ANY_SEQUENCE
+ Line 2805  CHOOSE_FROM_ANY_SEQUENCE
          $paramHash->{CHOICES} = [
                                     ['Without Answers', 'yes'],
                                     ['With Answers', 'no'],
-                                    ['Only Answers', 'only'],
+                                    ['Only Answers', 'only']
-                                    ['As Exam Problem', 'exam']
                                  ];
          Apache::lonhelper::dropdown->new();
  	addMessage("</td></tr>");
  	$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>");
  	    $startedTable = 1;
- Line 1874  CHOOSE_FROM_ANY_SEQUENCE
+ Line 2862  CHOOSE_FROM_ANY_SEQUENCE
  				     ['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=$env{'construct.style'};
  	    my $xmlfrag .= <<"RNDSEED";
  	    <message><tr><td align='right'>Use random seed:  </td><td></message>
  	    <string variable="curseed" size="15" maxlength="15">
- Line 1886  CHOOSE_FROM_ANY_SEQUENCE
+ Line 2883  CHOOSE_FROM_ANY_SEQUENCE
  	        </defaultvalue>
  	    </string>
  	     <message></td></tr><tr><td align="right">Use style file:</td><td></message>
-              <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>
+              <message><input type="text" size="40" name="style_file_value" value="$stylevalue"  />&nbsp; <a href="javascript:openbrowser('helpform','style_file_value','sty')">Select style file</a> </td><tr><td></message>
-              <message></td></tr></message>
+ 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
+                 <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'};
+ 	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
- 	}
+ 	}
      }
- Line 1911  RNDSEED
+ Line 2912  RNDSEED
      $helper->process();
      # MANUAL BAILOUT CONDITION:
      # If we're in the "final" state, bailout and return to handler
      if ($helper->{STATE} eq 'FINAL') {
- Line 1918  RNDSEED
+ Line 2920  RNDSEED
      }
      $r->print($helper->display());
+     if ($helper->{STATE} eq 'START') {
-     Apache::lonhelper::unregisterHelperTags();
+ 	&recently_generated($r);
+     }
-     untie %hash;
+     &Apache::lonhelper::unregisterHelperTags();
      return OK;
  }
- Line 1960  no strict;
+ Line 2962  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
  use Apache::lonlocal;
+ use Apache::lonnet;
  my $maxColumns = 2;
- my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]",
+ # it'd be nice if these all worked
-                  "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
+ #my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
-                  "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]",
+ #                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
-                  "A5 [148x210 mm]", "A6 [105x148 mm]" );
+ #                 "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]",
+ 		 "a4 [210x297 mm]");
  # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
  #                   Paper type
- Line 2001  sub render {
+ Line 3007  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 2020  STATEHTML
+ Line 3026  STATEHTML
      $result .= "</select></td><td>\n";
      $result .= "<select name='${var}.paper'>\n";
-     my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+     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) {
+ 	$_=~/(\w+)/;
+ 	my $papersize=$1;
          if ($paperSize[$i]=~/$DefaultPaperSize/) {
-             $result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
+             $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
          } else {
-             $result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
+             $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
          }
          $i++;
      }
      $result .= "</select></td></tr></table>";
      return $result;
  }
- Line 2043  sub postprocess {
+ Line 3051  sub postprocess {
      my $var = $self->{'variable'};
      my $helper = Apache::lonhelper->getHelper();
      $helper->{VARS}->{$var} =
-         $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
+         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
-         $ENV{"form.$var.paper"};
+         $env{"form.$var.paper"};
      return 1;
  }
- Line 2074  is no tag interface. You actually pass p
+ Line 3082  is no tag interface. You actually pass p
  =cut
  use Apache::lonhelper;
+ use Apache::lonnet;
  no strict;
  @ISA = ("Apache::lonhelper::element");
  use strict;
- Line 2095  sub new {
+ Line 3103  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 2108  sub render {
+ Line 3116  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;
+     }
      $result .= <<ELEMENTHTML;
- <p>How should the column be formatted?</p>
+ <p>How should each column be formatted?</p>
  <table cellpadding='3'>
    <tr>
      <td align='right'><b>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='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='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 2172  sub postprocess {
+ Line 3261  sub postprocess {
      my $var = $self->{'variable'};
      my $helper = Apache::lonhelper->getHelper();
-     my $width = $helper->{VARS}->{$var .'.width'} = $ENV{"form.${var}.width"};
+     my $width = $helper->{VARS}->{$var .'.width'} = $env{"form.${var}.width"};
-     my $height = $helper->{VARS}->{$var .'.height'} = $ENV{"form.${var}.height"};
+     my $height = $helper->{VARS}->{$var .'.height'} = $env{"form.${var}.height"};
-     my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $ENV{"form.${var}.lmargin"};
+     my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $env{"form.${var}.lmargin"};
-     $helper->{VARS}->{$var .'.widthunit'} = $ENV{"form.${var}.widthunit"};
+     $helper->{VARS}->{$var .'.widthunit'} = $env{"form.${var}.widthunit"};
-     $helper->{VARS}->{$var .'.heightunit'} = $ENV{"form.${var}.heightunit"};
+     $helper->{VARS}->{$var .'.heightunit'} = $env{"form.${var}.heightunit"};
-     $helper->{VARS}->{$var .'.lmarginunit'} = $ENV{"form.${var}.lmarginunit"};
+     $helper->{VARS}->{$var .'.lmarginunit'} = $env{"form.${var}.lmarginunit"};
      my $error = '';
      # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed
      # by an optional period, followed by digits, ending the string
-     if ($width !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+     if ($width !~  /^-?[0-9]*(\.[0-9]*)?$/) {
          $error .= "Invalid width; please type only a number.<br />\n";
      }
-     if ($height !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+     if ($height !~  /^-?[0-9]*(\.[0-9]*)?$/) {
          $error .= "Invalid height; please type only a number.<br />\n";
      }
-     if ($lmargin !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+     if ($lmargin !~  /^-?[0-9]*(\.[0-9]*)?$/) {
          $error .= "Invalid left margin; please type only a number.<br />\n";
+     } else {
+ 	# 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.312
changed lines
	Added in v.1.495