--- loncom/interface/lonprintout.pm	2005/04/07 07:03:23	1.374
+++ loncom/interface/lonprintout.pm	2006/08/21 22:53:19	1.480
@@ -1,7 +1,8 @@
-#  The LearningOnline Network
+#
+# The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.374 2005/04/07 07:03:23 albertel Exp $
+# $Id: lonprintout.pm,v 1.480 2006/08/21 22:53:19 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +42,159 @@ use Apache::lonnavmaps;
 use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
+use Carp;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
+my %perm;
+my %parmhash;
+my $resources_printed;
+
+
+# Format a header according to a format.  
+# 
+
+# Substitutions:
+#     %a    - Assignment name.
+#     %c    - Course name.
+#     %n    - Student name.
+#
+sub format_page_header {
+    my ($format, $assignment, $course, $student) = @_;
+    
+    #  Default format?
+
+    if ($format eq '') {
+	$format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
+	
+    } else {
+	$format =~ s/%a/$assignment/g;
+	$format =~ s/%c/$course/g;
+	$format =~ s/%n/$student/g;
+    }
+    
+
+    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:
@@ -106,7 +260,46 @@ 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;	
@@ -313,6 +506,7 @@ 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;
@@ -388,6 +582,7 @@ 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;
@@ -433,7 +628,7 @@ my %page_formats=
 	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
 	 },
 	 'album' => {
-	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],
+	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.83 in','1 cm'],
 	     '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
 	 },
      },
@@ -443,8 +638,8 @@ my %page_formats=
 	     '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']
 	 },
 	 'album' => {
-	     '1' => [],
-	     '2' => []
+	     '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' => {
@@ -453,8 +648,8 @@ my %page_formats=
 	     '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
 	 },
 	 'album' => {
-	     '1' => [],
-	     '2' => []
+	     '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' => {
@@ -489,12 +684,12 @@ my %page_formats=
      },
      'a4' => {
 	 'book' => {
-	     '1' => ['176 mm','272 mm','-40 pt in','-60 pt','-0.5 in'],
-	     '2' => [ '91 mm','272 mm','-40 pt in','-60 pt','-0.5 in']
+	     '1' => ['17.6 cm','27.2 cm','-0.55  in','-0.83 in','-0.5 in'],
+	     '2' => [ '9.1 cm','27.2 cm','-0.55  in','-0.83 in','-0.5 in']
 	 },
 	 'album' => {
-	     '1' => ['8.5 in','7.7 in','-40 pt in','-60 pt','0 in'],
-	     '2' => ['3.9 in','7.7 in','-40 pt in','-60 pt','0 in']
+	     '1' => ['8.5 in','7.7 in','-0.55 in','-0.83 in','0 in'],
+	     '2' => ['3.9 in','7.7 in','-0.55 in','-0.83 in','0 in']
 	 },
      },
      'a5' => {
@@ -538,14 +733,14 @@ sub get_name {
     if (!defined($udom)) { $udom=$env{'user.domain'}; }
     my $plainname=&Apache::loncommon::plainname($uname,$udom);
     if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
-    $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
+   $plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
     return $plainname;
 }
 
 sub get_course {
     my $courseidinfo;
     if (defined($env{'request.course.id'})) {
-	$courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
     }
     return $courseidinfo;
 }
@@ -553,22 +748,28 @@ 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($header_text, $assignment,
+					   $courseidinfo, $name);
     my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
     my $fancypagestatement='';
     if ($numberofcolumns eq '2') {
-	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
     } else {
-	$fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
     }
     if ($layout eq 'album') {
 	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
@@ -626,18 +827,21 @@ sub details_for_menu {
     return ($name_of_resource,$name_of_sequence,$name_of_map);
 }
 
+sub copyright_line {
+    return '\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\vspace*{-2 mm}\newline\noindent{\tiny Printed from LON-CAPA\copyright MSU{\hfill} Licensed under GNU General Public License } ';
+}
+my $end_of_student = "\n".'\special{ps:ENDOFSTUDENTSTAMP}'."\n";
 
 sub latex_corrections {
-
-    my ($number_of_columns,$result,$selectionmade) = @_;
-
+    my ($number_of_columns,$result,$selectionmade,$answer_mode) = @_;
 #    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
-    $result =~ s/\$number_of_columns/$number_of_columns/g;
-    if ($selectionmade ne '1') {
-	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
+    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\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
+	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline $copyright $end_of_student $1/;
     }
+    $result =~ s/\$number_of_columns/$number_of_columns/g;
     $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
     $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
 #-- LaTeX corrections     
@@ -648,7 +852,8 @@ 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;
@@ -659,7 +864,6 @@ sub latex_corrections {
     }
     $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
     $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
-
     return $result;
 }
 
@@ -694,13 +898,15 @@ sub IndexCreation {
 
 sub print_latex_header {
     my $mode=shift;
-    my $output='\documentclass[letterpaper]{article}';
-    if (($mode eq 'batchmode') || (!$env{'request.role.adv'})) {
+    my $output='\documentclass[letterpaper,twoside]{article}\raggedbottom';
+    if (($mode eq 'batchmode') || (!$perm{'pav'})) {
 	$output.='\batchmode';
     }
     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
+   	    '\usepackage{multirow}'."\n".
 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
 	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+	     '\usepackage{wrapfig}'.
 	     '\usepackage{picins}\usepackage{calc}'."\n".
 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
@@ -720,16 +926,19 @@ sub print_latex_header {
 
 sub path_to_problem {
     my ($urlp,$colwidth)=@_;
+    $urlp=&Apache::lonnet::clutter($urlp);
+
     my $newurlp = '';
     $colwidth=~s/\s*mm\s*$//;
 #characters average about 2 mm in width
     if (length($urlp)*2 > $colwidth) {
-	my @elements = split '/',$urlp;
+	my @elements = split('/',$urlp);
 	my $curlength=0;
 	foreach my $element (@elements) {
+	    if ($element eq '') { next; }
 	    if ($curlength+(length($element)*2) > $colwidth) {
-		$newurlp .=  '|\vskip -1 mm \noindent \verb|';
-		$curlength=0;
+		$newurlp .=  '|\vskip -1 mm \verb|';
+		$curlength=length($element)*2;
 	    } else {
 		$curlength+=length($element)*2;
 	    }
@@ -768,11 +977,14 @@ 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\//) {
-	$result.=' \strut \\\\ THIS IS EXTERNAL RESOURCE WITH URL \strut \\\\ '.$currentURL.' ';
+    if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
+	$currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
+	my $title=&Apache::lonnet::gettitle($symb);
+	$title = &Apache::lonxml::latex_special_symbols($title);
+	$result.=' \strut \\\\ '.$title.' \strut \\\\ '.$currentURL.' ';
     } else {
 	$result.=$currentURL;
     }
@@ -782,6 +994,49 @@ 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:
@@ -790,27 +1045,138 @@ sub unsupported {
 #    A reference to a page break hash.
 #
 #
+#use Data::Dumper;
+#sub dump_helper_vars {
+#    my ($helper) = @_;
+#    my $helpervars = Dumper($helper->{'VARS'});
+#    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");
+#}
+#sub dump_env {
+#    my $envvars = Dumper(\%env);
+#    &Apache::lonnet::logthis("Dump of env: \n $envvars");
+#}
+
+#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=&Apache::lonratedt::mapread($currentURL);
+    # 
+    #  These make this all support recursing for subsequences.
+    #
+    my @order    = @Apache::lonratedt::order;
+    my @resources = @Apache::lonratedt::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';
+		}
 
-sub get_page_breaks  {
-    my ($helper) = @_;
-    my %page_breaks;
-    
-    foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
-	$page_breaks{$break} = 1;
+		$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);
+	    }
+	}  
     }
-    
-    return %page_breaks;
+    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+    return $result;
 }
 
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
-    my $html=&Apache::lonxml::xmlbegin();
-    my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
-    $r->print(<<ENDPART);
-$html
-<head>
-<script type="text/javascript" language="Javascript">
+    $resources_printed = '';
+    my $js = <<ENDPART;
+<script type="text/javascript">
     var editbrowser;
     function openbrowser(formname,elementname,only,omit) {
         var url = '/res/?';
@@ -834,14 +1200,15 @@ $html
         editbrowser.focus();
     }
 </script>
-<title>LON-CAPA output for printing</title>
-</head>
-$bodytag
-Please stand by while processing your print request, this may take some time ...
 ENDPART
 
+    my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);
+    my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
 
 
+
+    $r->print($start_page."\n<p>\n$msg\n</p>\n");
+
     # fetch the pagebreaks and store them in the course environment
     # The page breaks will be pulled into the hash %page_breaks which is
     # indexed by symb and contains 1's for each break.
@@ -891,8 +1258,10 @@ ENDPART
     }
 
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
+	
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
+
 	if ($helper->{'VARS'}->{'construction'} ne '1') {
             #prints published resource
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
@@ -904,7 +1273,8 @@ ENDPART
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
-	if ($cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	if ($cleanURL!~m|^/adm/|
+	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
 	    my $texversion='';
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
@@ -927,25 +1297,38 @@ 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')) {
 		$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'});
+			$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 ';
@@ -967,71 +1350,27 @@ 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);
-	    for (my $member=0;$member<=$#Apache::lonratedt::order;$member++) {
-		$Apache::lonratedt::resources[$Apache::lonratedt::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;
-			$texversion=&Apache::lonnet::ssi($urlp,%form);
-		    }
-		    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
-		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
-		       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
-			$form{'grade_target'}='answer';
-			$form{'answer_output_mode'}='tex';
-			$form{'rndseed'}=$rndseed;
-			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
-                        if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
-			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 ';
-		}  
+	    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+	    $result .= &print_construction_sequence($currentURL, $helper, %form,
+						    $LaTeXwidth);
+	    $result .= '\end{document}';  
+	    if (!($result =~ /\\begin\{document\}/)) {
+		$result = &print_latex_header() . $result;
 	    }
-	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
-	    $result .= '\end{document}';   
+	    # End construction space sequence.
 	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
+		$resources_printed .= $currentURL.':';
 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
 		$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
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
@@ -1059,8 +1398,10 @@ 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++) {
 
 	    # Note due to document structure, not allowed to put \newpage
@@ -1071,15 +1412,19 @@ ENDPART
 		    $result.="\\newpage\n";
 		}
 	    }
-	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+	    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;}
 	    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);
@@ -1087,26 +1432,30 @@ 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')) {
-		    $form{'grade_target'}='answer';
-		    $form{'answer_output_mode'}='tex';
-		    my $answer=&Apache::lonnet::ssi($urlp,%form);
-		    &Apache::lonnet::appenv(('form.counter' => $current_counter));
+		    #  Don't permanently pervert the %form hash
+		    my %answerform = %form;
+		    $answerform{'grade_target'}='answer';
+		    $answerform{'answer_output_mode'}='tex';
+		    $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 ';
-			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
-			    $texversion.='\vskip 1 mm '.$answer;
+			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
+			    $title = &Apache::lonxml::latex_special_symbols($title);
+			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
+			    $body   .='\vskip 1 mm '.$answer;
+			    $body    = &encapsulate_minipage($body);
+			    $texversion .= $body;
 			} else {
 			    $texversion='';
 			}
@@ -1125,13 +1474,23 @@ 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($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)$/) { 
 		$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);
@@ -1141,7 +1500,8 @@ 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 {
@@ -1152,7 +1512,7 @@ ENDPART
 	    }	    
 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
 	}
-	&Apache::lonnet::delenv('form.counter');
+	&Apache::lonxml::clear_problem_counter();
 	if ($flag_page_in_sequence eq 'YES') {
 	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
 	}	
@@ -1177,14 +1537,28 @@ ENDPART
 	 #    Each element of the students array is of the form:
 	 #       username:domain:section:last, first:status
 	 #    
+	 #  Note that student sort is not compatible with printing 
+	 #  1 section per pdf...so that setting overrides.
 	 #   
-	 if ($helper->{'VARS'}->{'student_sort'}    eq 1) {
+	 if (($helper->{'VARS'}->{'student_sort'}    eq 1)  && 
+	     ($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
 	     @students = sort compare_names  @students;
 	 }
+	 &adjust_number_to_print($helper);
+
          if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
 	 }
+	 # If we are splitting on section boundaries, we need 
+	 # to remember that in split_on_sections and 
+	 # print all of the students in the list.
+	 #
+	 my $split_on_sections = 0;
+	 if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'section') {
+	     $split_on_sections = 1;
+	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} = $#students+1;
+	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 
 	 #loop over students
@@ -1198,6 +1572,8 @@ ENDPART
 	 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,'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";
@@ -1206,12 +1582,21 @@ ENDPART
 		 print $temp_file "1969\n";
 	     }
 	     $student_counter++;
-	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
-	     my ($output,$fullname)=&print_resources($r,$helper,
+	     if ($split_on_sections) {
+		 my $this_section = (split(/:/,$person))[2];
+		 if ($this_section ne $last_section) {
+		     $i++;
+		     $last_section = $this_section;
+		 }
+	     } else {
+		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
+	     }
+	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
 						     \%moreenv,\@master_seq,
 						     $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);
@@ -1227,29 +1612,64 @@ ENDPART
 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
+	 my $single_code = $helper->{'VARS'}->{'SINGLE_CODE'};
+	 my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
+
+	 my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
+	 open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+	 my ($code_type,$code_length)=('letter',6);
+	 foreach my $line (<FH>) {
+	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
+	     if ($name eq $code_option) {
+		 $code_length=$length;
+		 if ($type eq 'number') { $code_type = 'number'; }
+	     }
+	 }
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+         $moreenv{'instructor_comments'}='hide';
 	 my $seed=time+($$<<16)+($$);
 	 my @allcodes;
 	 if ($old_name) {
-	     my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
+	     my %result=&Apache::lonnet::get('CODEs',
+					     [$old_name,"type\0$old_name"],
+					     $cdom,$cnum);
+	     $code_type=$result{"type\0$old_name"};
 	     @allcodes=split(',',$result{$old_name});
 	     $num_todo=scalar(@allcodes);
+	 } elsif ($selected_code) { # Selection value is always numeric.
+	     $num_todo = 1;
+	     @allcodes = ($selected_code);
+	 } elsif ($single_code) {
+
+	     $num_todo    = 1;	# Unconditionally one code to do.
+	     # If an alpha code have to convert to numbers so it can be
+	     # converted back to letters again :-)
+	     #
+	     if ($code_type ne 'number') {
+		 $single_code = &letters_to_num($single_code);
+	     }
+	     @allcodes = ($single_code);
 	 } else {
 	     my %allcodes;
 	     srand($seed);
 	     for (my $i=0;$i<$num_todo;$i++) {
-		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,'6');
+		 $moreenv{'CODE'}=&get_CODE(\%allcodes,$i,$seed,$code_length,
+					    $code_type);
 	     }
 	     if ($code_name) {
 		 &Apache::lonnet::put('CODEs',
-				      {$code_name =>join(',',keys(%allcodes))},
+				      {
+					$code_name =>join(',',keys(%allcodes)),
+					"type\0$code_name" => $code_type
+				      },
 				      $cdom,$cnum);
 	     }
 	     @allcodes=keys(%allcodes);
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	 my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+	 &adjust_number_to_print($helper);
 	 my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
 	 if ($number_per_page eq '0' || $number_per_page eq 'all') {
 	     $number_per_page=$num_todo;
@@ -1259,11 +1679,16 @@ ENDPART
 	 my $count=0;
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
-	     $moreenv{'CODE'}=&num_to_letters($code);
-	     my ($output,$fullname)=
+	     if ($code_type eq 'number') { 
+		 $moreenv{'CODE'}=$code;
+	     } else {
+		 $moreenv{'CODE'}=&num_to_letters($code);
+	     }
+	     my ($output,$fullname, $printed)=
 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
 				  \@master_seq,$flag_latex_header_remove,
 				  $LaTeXwidth);
+	     $resources_printed .= ":";
 	     $print_array[$file_num].=$output;
 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
 				       &mt('last assignment').' '.$fullname);
@@ -1294,14 +1719,18 @@ ENDPART
 		} 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')) {
-		    $form{'grade_target'}='answer';
-		    $form{'answer_output_mode'}='tex';
-		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-		    $form{'rndseed'}=$rndseed;
-		    my $answer=&Apache::lonnet::ssi($urlp,%form);
+		    #  Don't permanently pervert %form:
+		    my %answerform = %form;
+		    $answerform{'grade_target'}='answer';
+		    $answerform{'answer_output_mode'}='tex';
+		    $answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+		    $answerform{'rndseed'}=$rndseed;
+		    $resources_printed .= $urlp.':';
+		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 		    } else {
@@ -1344,20 +1773,19 @@ 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,$selectionmade);
-    for (my $i=1;$i<=$#print_array;$i++) {$print_array[$i] = &latex_corrections($number_of_columns,$print_array[$i],$selectionmade);}
-    #changes page's parameters for the one column output 
-    if ($numberofcolumns == 1) {
+    $result = &latex_corrections($number_of_columns,$result,$selectionmade,
+				 $helper->{'VARS'}->{'ANSWER_TYPE'});
+    #if ($numberofcolumns == 1) {
 	$result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
-	$result =~ s/\\textheight\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+	$result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
 	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
 	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-    }
+    #}
 
 #-- 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 $!");
@@ -1373,14 +1801,21 @@ 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; 
@@ -1407,7 +1842,7 @@ ENDPART
     my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} ne '1') {
 	#prints published resource
-	$URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
+	$URLback=&escape('/adm/flip?postdata=return:');
     } else {
 	#prints resource from the construction space
 	$URLback='/'.$helper->{'VARS'}->{'filename'};
@@ -1416,46 +1851,50 @@ 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.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
-			    'cgi.'.$identifier.'role' => $env{'request.role.adv'},
-                            'cgi.'.$identifier.'numberoffiles' => $#print_array,
-                            'cgi.'.$identifier.'studentnames' => $student_names,
-                            'cgi.'.$identifier.'backref' => $URLback,);
- 
-$r->print(<<FINALEND);
+			    'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+			    'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+			    'cgi.'.$identifier.'.role' => $perm{'pav'},
+                            'cgi.'.$identifier.'.numberoffiles' => $#print_array,
+                            'cgi.'.$identifier.'.studentnames' => $student_names,
+                            'cgi.'.$identifier.'.backref' => $URLback,);
+    &Apache::lonnet::appenv("cgi.$identifier.user"    => $env{'user.name'},
+			    "cgi.$identifier.domain"  => $env{'user.domain'},
+			    "cgi.$identifier.courseid" => $cnum, 
+			    "cgi.$identifier.coursedom" => $cdom, 
+			    "cgi.$identifier.resources" => $resources_printed);
+
+    my $end_page = &Apache::loncommon::end_page();
+    $r->print(<<FINALEND);
 <br />
 <meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
 <a href="/cgi-bin/printout.pl?$identifier">Continue</a>
-</body>
-</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);
+	    }
 	}
     }
 }
@@ -1464,6 +1903,7 @@ sub print_resources {
     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;
@@ -1471,13 +1911,26 @@ sub print_resources {
 	$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}) {
@@ -1490,27 +1943,38 @@ sub print_resources {
 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
-		if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		if ($res_url!~m|^ext/|
+		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		    $printed .= $curresline.':';
+
+		    &Apache::lonxml::remember_problem_counter();    
+
 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
-		    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')) {
-			$moreenv->{'answer_output_mode'}='tex';
-			$moreenv->{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
-			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%{$moreenv});
-			&Apache::lonnet::appenv(('form.counter' => $current_counter));
+			#   Use a copy of the hash so we don't pervert it on future loop passes.
+			my %answerenv = %{$moreenv};
+			$answerenv{'answer_output_mode'}='tex';
+			$answerenv{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+			
+			&Apache::lonxml::restore_problem_counter();
+
+			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%answerenv);
+
 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
 			} else {
-			    $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);
-			    $rendered.='\vskip 1 mm '.$ansrendered;
+
+			    
+			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+			    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') {
@@ -1520,21 +1984,18 @@ sub print_resources {
 		    }
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
+		    $printed .= $curresline.':';
 		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
-		    my $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 ($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 {
@@ -1551,51 +2012,48 @@ sub print_resources {
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
+    my $header_line =
+	&format_page_header($parmhash{'print_header_format'},
+			    $currentassignment, $courseidinfo, $fullname);
+    my $header_start = ($columns_in_format == 1) ? '\lhead'
+	                                         : '\fancyhead[LO]';
+    $header_line = $header_start.'{'.$header_line.'}';
+
     if ($current_output=~/\\documentclass/) {
-	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}}\\vskip 5 mm /;
+	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
     } else {
-	my $blankpages = '';
-	for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
-	$current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
+	my $blankpages = 
+	    '\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};
+	    
+	$current_output = '\strut\vspace*{-6 mm}\\newline'.
+	    &copyright_line().' \newpage '.$blankpages.$end_of_student.
+	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'.
+	    $header_line.$namepostfix.'} \vskip 5 mm '.$current_output;
     }
-    return ($current_output,$fullname);
+    #
+    #  Close the student bracketing.
+    #
+    return ($current_output,$fullname, $printed);
 
 }
 
 sub handler {
 
     my $r = shift;
-    my $helper;
+    
+    &init_perm();
+
+
 
-#    my $loaderror=&Apache::lonnet::overloaderror($r);
-#    if ($loaderror) { return $loaderror; }
-#    $loaderror=
-#       &Apache::lonnet::overloaderror($r,
-#         $env{'course.'.$env{'request.course.id'}.'.home'});
-#    if ($loaderror) { return $loaderror; }
-
-    my $result = printHelper($r);
-    if (!ref($result)) {
-	return $result;
+    my $helper = printHelper($r);
+    if (!ref($helper)) {
+	return $helper;
     }
-    $helper = $result;
    
-#	my $key; 
-#	foreach $key (keys %{$helper->{'VARS'}}) {
-#	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
-#	}
-#	foreach $key (keys %env) {
-#	    $r->print(' '.$key.'->'.$env{$key}.'<-<br />');
-#	}
-#	return OK;
 
-    my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+    %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
  
-#	my $key; 
-#	foreach $key (keys %parmhash) {
-#	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
-#	}
-#
+
 
 
     #  If a figure conversion queue file exists for this user.domain
@@ -1619,7 +2077,21 @@ sub addMessage {
     Apache::lonhelper::message->new();
 }
 
-use Data::Dumper;
+
+
+sub init_perm {
+    undef(%perm);
+    $perm{'pav'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});
+    if (!$perm{'pav'}) {
+	$perm{'pav'}=&Apache::lonnet::allowed('pav',
+		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    }
+    $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
+    if (!$perm{'pfo'}) {
+	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
+		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    }
+}
 
 sub printHelper {
     my $r = shift;
@@ -1664,23 +2136,28 @@ sub printHelper {
     $helper->declareVar("showallfoils");
 
     #  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.
+    #
 
-    if((!defined($env{"form.CURRENT_STATE"}))  ||
-       ($env{'form.CURRENT_STATE'} == "START")) {
-	$helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g.
-    }
-
-
+    # $helper->{VARS}->{FINISHPAGE} = '';
     
     &Apache::loncommon::restore_course_settings('print',
 						{'pagebreaks'  => 'scalar',
 					         'lastprinttype' => 'scalar'});
-
     
-    if("$helper->{VARS}->{PRINT_TYPE}" eq "$env{'form.lastprinttype'}") {
-	$helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
-    }
     
+    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'};
+	    }
+	}
+	
+    }
     
     # This will persistently load in the data we want from the
     # very first screen.
@@ -1688,7 +2165,7 @@ sub printHelper {
     if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "~$1/$2";
         $helper->{VARS}->{'construction'} = 1;
-    } else {
+    } elsif ($env{'form.postdata'}) {
         if ($env{'form.postdata'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
         }
@@ -1698,8 +2175,8 @@ sub printHelper {
         if ($env{'form.url'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
         }
-    }
 
+    }
     if ($env{'form.symb'}) {
         $helper->{VARS}->{'symb'} = $env{'form.symb'};
     }
@@ -1711,7 +2188,6 @@ sub printHelper {
 	&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
-
     
     # Extract map
     my $symb = $helper->{VARS}->{'symb'};
@@ -1719,16 +2195,24 @@ sub printHelper {
     my $subdir;
 
     # Get the resource name from construction space
+
+
     if ($helper->{VARS}->{'construction'}) {
         $resourceTitle = substr($helper->{VARS}->{'filename'}, 
                                 rindex($helper->{VARS}->{'filename'}, '/')+1);
         $subdir = substr($helper->{VARS}->{'filename'},
                          0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
-    } else {
+    } elsif ($env{'form.postdata'} =~ /^\/res\// ) {
+        $subdir = substr($env{'form.postdata'},
+                         0, rindex($env{'form.postdata'}, '/') + 1);
+    } elsif ((defined $helper->{VARS}->{'postdata'}) &&
+	     ($helper->{VARS}->{'postdata'} =~  /^\/res\//)){
+        $subdir = substr($helper->{VARS}->{'postdata'},
+                         0, rindex($helper->{VARS}->{'postdata'}, '/') + 1);
+    } else {     #    (!$helper->{VARS}->{'postdata'}) {
         ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
         $helper->{VARS}->{'postdata'} = 
 	    &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
-
         if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
             my $postdata = $helper->{VARS}->{'postdata'};
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
@@ -1743,11 +2227,8 @@ sub printHelper {
     }
 
     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();
+    &Apache::lonhelper::registerHelperTags();
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
@@ -1772,7 +2253,7 @@ 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
@@ -1787,42 +2268,45 @@ sub printHelper {
 
     $helper->declareVar('SEQUENCE');
 
-    # Useful for debugging: Dump the help vars
-#    $r->print(Dumper($helper->{VARS}));
-#    $r->print($map);
-
     # If we're in a sequence...
+
+    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}->{'postdata'} !~ /^\/res\//) &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
-        push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence
-        push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+        push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
 
         my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
-    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
 
   <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
-    <message>(mark them then click "next" button) <br /></message>
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
 HELPERFRAGMENT
@@ -1830,50 +2314,62 @@ HELPERFRAGMENT
 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
     }
 
-    # If the user is privileged, allow them to print all 
+    # If the user has pfo (print for otheres) allow them to print all 
     # problems and resources  in the entier course, optionally for selected students
-    if ($userPriviledged && 
-        ($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}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
+    if ($perm{'pfo'} && 
+        $helper->{VARS}->{'postdata'} !~/^\/res\// && 
+	$helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/) { 
+        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>
-      <option text='Newpage' variable='FINISHPAGE' />
+      $start_new_option
     </resource>
   </state>
   <state name="ALL_RESOURCES" title="Select Resource(s) to print">
-    <message>(Mark them then click "next" button) <br /> </message>
     <resource variable="RESOURCES" toponly='0' multichoice='1'
               suppressEmptySequences='0' addstatus='1' closeallpages='1'>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isNotMap; </filterfunc>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='NewPage' variable='FINISHPAGE' />
+      $start_new_option
     </resource>
   </state>
 ALL_PROBLEMS
 
 	if ($helper->{VARS}->{'assignment'}) {
-	    push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
-	    push @{$printChoices}, ["<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>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
+	    push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
+
+	# 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>
-      <option text='New Page' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
+    </state>
+    <state name="PRINT_FORMATTING" title="How should results be printed?">
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
@@ -1881,20 +2377,29 @@ 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>
-    <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+    <nextstate>PAGESIZE</nextstate>
+    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
+    <choices variable="SPLIT_PDFS">
+       <choice computer="all">All assignments in a single PDF file</choice>
+       <choice computer="sections">Each PDF contains exactly one section</choice>
+       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+            Specify the number of assignments per PDF:</choice>
+    </choices>
+    </state>
 RESOURCE_SELECTOR
 
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
-      <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1"/>
       <message><b>Select sort order</b> </message>
     <choices variable='student_sort'>
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
-    $resource_selector
+      <message><br /><hr /><br /> </message>
+      <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
   </state>
+    $resource_selector
 CHOOSE_STUDENTS
 
 	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -1903,17 +2408,70 @@ CHOOSE_STUDENTS
 	my $namechoice='<choice></choice>';
 	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
 	    if ($name =~ /^error: 2 /) { next; }
+	    if ($name =~ /^type\0/) { next; }
 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
 	}
+
+
+	my %code_values;
+	my %codes_to_print;
+	foreach my $key (@names) {
+	    %code_values = &Apache::grades::get_codes($key, $cdom, $cnum);
+	    foreach my $key (keys(%code_values)) {
+		$codes_to_print{$key} = 1;
+	    }
+	}
+
+	my $code_selection;
+	foreach my $code (sort {uc($a) cmp uc($b)} (keys(%codes_to_print))) {
+	    my $choice  = $code;
+	    if ($code =~ /^[A-Z]+$/) { # Alpha code
+		$choice = &letters_to_num($code);
+	    }
+	    push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
+	}
+	if (%codes_to_print) {
+	    $code_selection .='   
+	    <message><b>Choose single CODE from list:</b></message>
+		<message></td><td></message>
+		<dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+                  <choice></choice>
+                  <exec>
+                     push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+                  </exec>
+		</dropdown>
+	    <message></td></tr><tr><td></message>
+            '.$/;
+
+	}
+
+	
+	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+	my $codechoice='';
+	foreach my $line (<FH>) {
+	    my ($name,$description,$code_type,$code_length)=
+		(split(/:/,$line))[0,1,2,4];
+	    if ($code_length > 0 && 
+		$code_type =~/^(letter|number|-1)/) {
+		$codechoice.='<choice computer="'.$name.'">'.$description.'</choice>';
+	    }
+	}
+	if ($codechoice eq '') {
+	    $codechoice='<choice computer="default">Default</choice>';
+	}
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
-  <state name="CHOOSE_ANON1" title="Select Students and Resources">
-    <nextstate>PAGESIZE</nextstate>
-    <message><hr width='33%' /></message>
-    <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
+  <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">
+    <nextstate>SELECT_PROBLEMS</nextstate>
+    <message><h4>Fill out one of the forms below</h4></message>
+    <message><br /><hr /> <br /></message>
+    <message><h3>Generate new CODEd Assignments</h3></message>
+    <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
-	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+            !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
 	return undef;
@@ -1923,33 +2481,63 @@ CHOOSE_STUDENTS
     <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></td></tr><tr><td></message>
+    <message><b>Bubble sheet type:</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+    $codechoice
+    </dropdown>
+    <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
+    <message></td></tr><tr><td></table></message>
+    <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+    <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+    <string variable="SINGLE_CODE" size="10">
+        <validator>
+	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
+	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+						      \$helper->{'VARS'}{'CODE_OPTION'});
+	   } else {
+	       return undef;	# Other forces control us.
+	   }
+        </validator>
+    </string>
+    <message></td></tr><tr><td></message>
+        $code_selection
     <message></td></tr></table></message>
-    <message><hr width='33%' /></message>
-    <message><b>Reprint a set of saved CODEs:</b></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>
-    $resource_selector
+    <message></td></tr></table></message>
   </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}, ["<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>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+	    push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
 	    
 
 	$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>
-      <option text='Newpage' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
+    </state>
+    <state name="PRINT_FORMATTING" title="Format of the print job">
+    <nextstate>NUMBER_PER_PDF</nextstate>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
@@ -1957,30 +2545,44 @@ 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>
-    <string variable="NUMBER_TO_PRINT" maxlength="5" size="5"><defaultvalue>"all"</defaultvalue></string>
+    <nextstate>PAGESIZE</nextstate>
+    <message><hr width='33%' /><b>How do you want assignments split into PDF files? </b></message>
+    <choices variable="SPLIT_PDFS">
+       <choice computer="all">All assignments in a single PDF file</choice>
+       <choice computer="sections">Each PDF contains exactly one section</choice>
+       <choice computer="oneper">Each PDF contains exactly one assignment</choice>
+       <choice computer="usenumber" relatedvalue="NUMBER_TO_PRINT">
+           Specify the number of assignments per PDF:</choice>
+    </choices>
+    </state>
 RESOURCE_SELECTOR
 
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
-    <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1" />
     <choices variable='student_sort'>
       <choice computer='0'>Sort by section then student</choice>
       <choice computer='1'>Sort by students across sections.</choice>
     </choices>
+    <message><br /><hr /><br /></message>
+    <student multichoice='1' variable="STUDENTS" nextstate="SELECT_RESOURCES" coursepersonnel="1" />
 
-    $resource_selector
     </state>
+    $resource_selector
 CHOOSE_STUDENTS1
 
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
-  <state name="CHOOSE_ANON2" title="Select Students and Resources">
-    <nextstate>PAGESIZE</nextstate>
-    <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
+  <state name="CHOOSE_ANON2" title="Select CODEd Assignments">
+    <nextstate>SELECT_RESOURCES</nextstate>
+    <message><h4>Fill out one of the forms below</h4></message>
+    <message><br /><hr /> <br /></message>
+    <message><h3>Generate new CODEd Assignments</h3></message>
+    <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
        <validator>
 	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
-	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+	    !\$helper->{'VARS'}{'SINGLE_CODE'}                   &&
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
 	    return "You need to specify the number of assignments to print";
 	}
 	return undef;
@@ -1990,26 +2592,51 @@ CHOOSE_STUDENTS1
     <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></td></tr><tr><td></message>
+    <message><b>Bubble sheet type:</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+    $codechoice
+    </dropdown>
+    <message></td></tr><tr><td></table></message>
+    <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+    <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+    <string variable="SINGLE_CODE" size="10">
+        <validator>
+	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
+	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
+	      !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	      return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+						      \$helper->{'VARS'}{'CODE_OPTION'});
+	   } else {
+	       return undef;	# Other forces control us.
+	   }
+        </validator>
+    </string>
+    <message></td></tr><tr><td></message>
+        $code_selection
     <message></td></tr></table></message>
-    <message><hr width='33%' /></message>
-    <message><b>Reprint a set of saved CODEs:</b></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>
-    $resource_selector
+    <message></td></tr></table></message>
   </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/') {    
-        push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+    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 $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {    
+        push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$subdir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
 
         my $f = '$filename';
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</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>
@@ -2029,8 +2656,8 @@ 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'}) {
-	push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> in course",
+    if (!$helper->{VARS}->{'construction'} && ($helper->{VARS}->{'postdata'} !~ /^\/res\//)) {
+	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
@@ -2043,7 +2670,8 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
+	</choicefunc>
       </resource>
     </state>
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
@@ -2051,15 +2679,14 @@ CHOOSE_FROM_SUBDIR
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
               closeallpages="1">
       <nextstate>PAGESIZE</nextstate>
-      <filterfunc>return $isProblem</filterfunc>
+      <filterfunc>return $isNotMap</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='Newpage' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
     </state>
 CHOOSE_FROM_ANY_SEQUENCE
 }
-
     # Generate the first state, to select which resources get printed.
     Apache::lonhelper::state->new("START", "Select Printing Options:");
     $paramHash = Apache::lonhelper::getParamHash();
@@ -2073,7 +2700,7 @@ CHOOSE_FROM_ANY_SEQUENCE
     my $startedTable = 0; # have we started an HTML table yet? (need
                           # to close it later)
 
-    if (($env{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
+    if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
 	addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
@@ -2089,7 +2716,7 @@ CHOOSE_FROM_ANY_SEQUENCE
 	$startedTable = 1;
     }
 
-    if ($env{'request.role.adv'}) {
+    if ($perm{'pav'}) {
 	if (!$startedTable) {
 	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
 	    $startedTable = 1;
@@ -2140,19 +2767,14 @@ CHOOSE_FROM_ANY_SEQUENCE
 	    Apache::lonhelper::dropdown->new();
 	    addMessage("</td></tr>");
 
-            #  If advanced roles, then allow to show all foils.
-
-            if ($env{'request.role.adv'}) {
-		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>");
-            }
-
+	    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'}) { 
@@ -2165,17 +2787,16 @@ 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></td></tr></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>
 	     <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'};
 	    
 	} 
-
     }
 
 
@@ -2195,6 +2816,7 @@ RNDSEED
 
     $helper->process();
 
+
     # MANUAL BAILOUT CONDITION:
     # If we're in the "final" state, bailout and return to handler
     if ($helper->{STATE} eq 'FINAL') {
@@ -2202,7 +2824,9 @@ RNDSEED
     }    
 
     $r->print($helper->display());
-
+    if ($helper->{STATE} eq 'START') {
+	&recently_generated($r);
+    }
     &Apache::lonhelper::unregisterHelperTags();
 
     return OK;
@@ -2245,10 +2869,13 @@ use Apache::lonlocal;
 use Apache::lonnet;
 
 my $maxColumns = 2;
+# it'd be nice if these all worked
+#my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
+#                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
+#                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]", 
+#                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
 my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
-                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
-                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]", 
-                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
+		 "a4 [210x297 mm]");
 
 # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
 #                   Paper type
@@ -2284,8 +2911,8 @@ sub render {
   </tr>
   <tr>
     <td>
-      <input type="radio" name="${var}.layout" value="L" /> Landscape<br />
-      <input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait
+      <label><input type="radio" name="${var}.layout" value="L" /> Landscape </label><br />
+      <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> Portrait </label>
     </td>
     <td align="center">
       <select name="${var}.cols">
@@ -2304,7 +2931,8 @@ STATEHTML
     $result .= "<select name='${var}.paper'>\n";
 
     my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
-    my $DefaultPaperSize=$parmhash{'default_paper_size'};
+    my $DefaultPaperSize=lc($parmhash{'default_paper_size'});
+    $DefaultPaperSize=~s/\s//g;
     if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
     $i = 0;
     foreach (@paperSize) {
@@ -2379,10 +3007,10 @@ 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;
 }
 
@@ -2392,60 +3020,141 @@ 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
-making the width much smaller than the width of the page.</p>
+<!--<p>Hint: Some instructors like to leave scratch space for the student by
+making the width much smaller than the width of the page.</p>-->
 
 ELEMENTHTML
 
     return $result;
 }
 
-# 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;
@@ -2468,14 +3177,22 @@ sub postprocess {
     # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed 
     # by an optional period, followed by digits, ending the string
 
-    if ($width !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+    if ($width !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid width; please type only a number.<br />\n";
     }
-    if ($height !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+    if ($height !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid height; please type only a number.<br />\n";
     }
-    if ($lmargin !~  /^-?[0-9]+(\.[0-9]*)?$/) {
+    if ($lmargin !~  /^-?[0-9]*(\.[0-9]*)?$/) {
         $error .= "Invalid left margin; please type only a number.<br />\n";
+    } else {
+	# Adjust for LaTeX 1.0 inch margin:
+
+	if ($env{"form.${var}.lmarginunit"} eq "in") {
+	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 1;
+	} else {
+	    $helper->{VARS}->{$var.'.lmargin'} = $lmargin - 2.54;
+	}
     }
 
     if (!$error) {