--- loncom/interface/lonprintout.pm	2005/02/09 19:53:55	1.343.2.3
+++ loncom/interface/lonprintout.pm	2006/06/12 11:19:02	1.441
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.343.2.3 2005/02/09 19:53:55 albertel Exp $
+# $Id: lonprintout.pm,v 1.441 2006/06/12 11:19:02 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,9 +41,129 @@ use Apache::lonnavmaps;
 use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
+use Carp;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
-my $LaTeXwidth = 0;
+my %perm;
 
+#
+#   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:
@@ -109,7 +229,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;	
@@ -316,6 +475,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;
@@ -391,6 +551,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;
@@ -446,8 +607,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' => {
@@ -456,8 +617,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' => {
@@ -537,8 +698,8 @@ sub page_format {
 
 sub get_name {
     my ($uname,$udom)=@_;
-    if (!defined($uname)) { $uname=$ENV{'user.name'}; }
-    if (!defined($udom)) { $udom=$ENV{'user.domain'}; }
+    if (!defined($uname)) { $uname=$env{'user.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');
@@ -547,8 +708,8 @@ sub get_name {
 
 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');
+    if (defined($env{'request.course.id'})) {
+	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
     }
     return $courseidinfo;
 }
@@ -610,7 +771,7 @@ sub page_cleanup {
 
 sub details_for_menu {
     my ($helper)=@_;
-    my $postdata=$ENV{'form.postdata'};
+    my $postdata=$env{'form.postdata'};
     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
     my $name_of_resource = &Apache::lonnet::gettitle($postdata);
     my $symbolic = &Apache::lonnet::symbread($postdata);
@@ -621,9 +782,9 @@ sub details_for_menu {
 	$map =~ m|([^/]+)$|;
 	$name_of_sequence = $1;
     }
-    my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'});
+    my $name_of_map = &Apache::lonnet::gettitle($env{'request.course.uri'});
     if ($name_of_map =~ /^\s*$/) {
-	$ENV{'request.course.uri'} =~ m|([^/]+)$|;
+	$env{'request.course.uri'} =~ m|([^/]+)$|;
 	$name_of_map = $1;
     }
     return ($name_of_resource,$name_of_sequence,$name_of_map);
@@ -631,15 +792,13 @@ sub details_for_menu {
 
 
 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/;
+    if ($selectionmade eq '1' || $answer_mode eq 'only') {
+	$result =~ s/(\\end{document})/\\strut\\vskip 0 mm\\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/;
     } 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\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
     }
     $result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
     $result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
@@ -651,7 +810,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;
@@ -662,7 +822,6 @@ sub latex_corrections {
     }
     $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
     $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
-
     return $result;
 }
 
@@ -697,13 +856,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}';
+    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".
@@ -723,16 +884,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 > $LaTeXwidth) {
-	my @elements = split '/',$urlp;
+    if (length($urlp)*2 > $colwidth) {
+	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;
 	    }
@@ -771,11 +935,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;
     }
@@ -784,13 +951,81 @@ sub unsupported {
 }
 
 
+#
+# List of recently generated print files
+#
+sub recently_generated {
+    my $r=shift;
+    my $prtspool=$r->dir_config('lonPrtDir');
+    my $zip_result;
+    my $pdf_result;
+    opendir(DIR,$prtspool);
+
+    my @files = 
+	grep(/^$env{'user.name'}_$env{'user.domain'}_printout_(\d+)_.*\.(pdf|zip)$/,readdir(DIR));
+    closedir(DIR);
+
+    @files = sort {
+	my ($actime) = (stat($prtspool.'/'.$a))[10];
+	my ($bctime) = (stat($prtspool.'/'.$b))[10];
+	return $bctime <=> $actime;
+    } (@files);
+
+    foreach my $filename (@files) {
+	my ($ext) = ($filename =~ m/(pdf|zip)$/);
+	my ($cdev,$cino,$cmode,$cnlink,
+	    $cuid,$cgid,$crdev,$csize,
+	    $catime,$cmtime,$cctime,
+	    $cblksize,$cblocks)=stat($prtspool.'/'.$filename);
+	my $result="<a href='/prtspool/$filename'>".
+	    &mt('Generated [_1] ([_2] bytes)',
+		&Apache::lonlocal::locallocaltime($cctime),$csize).
+		'</a><br />';
+	if ($ext eq 'pdf') { $pdf_result .= $result; }
+	if ($ext eq 'zip') { $zip_result .= $result; }
+    }
+    if ($zip_result) {
+	$r->print('<h4>'.&mt('Recently generated printout zip files')."</h4>\n"
+		  .$zip_result);
+    }
+    if ($pdf_result) {
+	$r->print('<h4>'.&mt('Recently generated printouts')."</h4>\n"
+		  .$pdf_result);
+    }
+}
+
+#
+#   Retrieve the hash of page breaks.
+#
+#  Inputs:
+#    helper   - reference to helper object.
+#  Outputs
+#    A reference to a page break hash.
+#
+#
+#use Data::Dumper;
+#sub dump_helper_vars {
+#    my ($helper) = @_;
+#    my $helpervars = Dumper($helper->{'VARS'});
+#    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");
+#}
+
+sub get_page_breaks  {
+    my ($helper) = @_;
+    my %page_breaks;
+
+    foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
+	$page_breaks{$break} = 1;
+    }
+    return %page_breaks;
+}
+
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
-    my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
-    $r->print(<<ENDPART);
-<html>
-<script type="text/javascript" language="Javascript" >
+    my $resources_printed = '';
+    my $js = <<ENDPART;
+<script type="text/javascript">
     var editbrowser;
     function openbrowser(formname,elementname,only,omit) {
         var url = '/res/?';
@@ -814,13 +1049,25 @@ sub output_data {
         editbrowser.focus();
     }
 </script>
-<head>
-<title>LON-CAPA output for printing</title>
-</head>
-$bodytag
-Please stand by while processing your print request, this may take some time ...
 ENDPART
 
+    my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);
+    my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
+
+    $r->print($start_page."\n<p>\n$msg\n</p>\n");
+
+    # fetch the pagebreaks and store them in the course environment
+    # The page breaks will be pulled into the hash %page_breaks which is
+    # indexed by symb and contains 1's for each break.
+
+    $env{'form.pagebreaks'}  = $helper->{'VARS'}->{'FINISHPAGE'};
+    $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'}; 
+    &Apache::loncommon::store_course_settings('print',
+					      {'pagebreaks'    => 'scalar',
+					       'lastprinttype' => 'scalar'});
+
+    my %page_breaks  = &get_page_breaks($helper);
+
     my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
     my ($result,$selectionmade) = ('','');
     my $number_of_columns = 1; #used only for pages to determine the width of the cell
@@ -832,14 +1079,35 @@ ENDPART
 	$laystyle='book';
     }
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
-    my $assignment =  $ENV{'form.assignment'};
+    my $assignment =  $env{'form.assignment'};
     my $LaTeXwidth=&recalcto_mm($textwidth); 
     my @print_array=();
     my @student_names=();
-    
+
+    #  Common settings for the %form has:
+    # In some cases these settings get overriddent by specific cases, but the
+    # settings are common enough to make it worthwhile factoring them out
+    # here.
+    #
+    my %form;
+    $form{'grade_target'} = 'tex';
+    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+
+    # If form.showallfoils is set, then request all foils be shown:
+    # privilege will be enforced both by not allowing the 
+    # check box selecting this option to be presnt unless it's ok,
+    # and by lonresponse's priv. check.
+    # The if is here because lonresponse.pm only cares that
+    # showallfoils is defined, not what the value is.
+
+    if ($helper->{'VARS'}->{'showallfoils'} eq "1") { 
+	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
+    }
+
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
+
 	if ($helper->{'VARS'}->{'construction'} ne '1') {
             #prints published resource
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
@@ -851,7 +1119,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') {
@@ -859,14 +1128,11 @@ ENDPART
 		$moreenv{'request.filename'}=$cleanURL;
 		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
 		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
-		    my $dom = $ENV{'user.domain'};
-		    my $user = $ENV{'user.name'};
+		    my $dom = $env{'user.domain'};
+		    my $user = $env{'user.name'};
 		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
 		}
-		my %form;
                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -877,18 +1143,29 @@ ENDPART
 		}
 		$form{'rndseed'}=$rndseed;
 		&Apache::lonnet::appenv(%moreenv);
-		&Apache::lonnet::delenv('form.counter');
-		&Apache::lonxml::init_counter();
+
+		&Apache::lonxml::clear_problem_counter();
+
+		$resources_printed .= $currentURL.':';
 		$texversion.=&Apache::lonnet::ssi($currentURL,%form);
-		&Apache::lonnet::delenv('form.counter');
+
+		&Apache::lonxml::clear_problem_counter();
+
 		&Apache::lonnet::delenv('request.filename');
 	    }
+	    # current document with answers.. no need to encap in minipage
+	    #  since there's only one answer.
+
 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		my %form;
+		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
 		$form{'rndseed'}=$rndseed;
+                if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {
+		    $form{'problemtype'}='exam';
+		}
+		$resources_printed .= $currentURL.':';
 		my $answer=&Apache::lonnet::ssi($currentURL,%form);
 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
@@ -917,7 +1194,8 @@ 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;
@@ -932,31 +1210,36 @@ ENDPART
 		if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 		    my $texversion='';
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
-			my %form;
-			$form{'grade_target'}='tex';
-			$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 			$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 			$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)$/)) {
-			my %form;
-			$form{'grade_target'}='answer';
-			$form{'answer_output_mode'}='tex';
-			$form{'rndseed'}=$rndseed;
-                        if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
-			my $answer=&Apache::lonnet::ssi($urlp,%form);
+			#  Don't permanently modify %$form...
+			my %answerform = %form;
+			$answerform{'grade_target'}='answer';
+			$answerform{'answer_output_mode'}='tex';
+			$answerform{'rndseed'}=$rndseed;
+			$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+                        if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
+			$resources_printed .= $urlp.':';
+			my $answer=&Apache::lonnet::ssi($urlp,%answerform);
 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 			} else {
+			    # If necessary, encapsulate answer in minipage:
+
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $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}';
+			    my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+			    $body.=&path_to_problem($urlp,$LaTeXwidth);
+			    $body.='\vskip 1 mm '.$answer.'\end{document}';
+			    $body = &encapsulate_minipage($body);
+			    $texversion.=$body;
 			}
 		    }
 		    if ($flag_latex_header_remove ne 'NO') {
@@ -979,19 +1262,19 @@ ENDPART
 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
 	    $result .= '\end{document}';   
 	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
-		my %form;
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
+		$resources_printed .= $currentURL.':';
 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
 		$result .= $texversion;
 	} else {
-	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'});
+	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
+				  $helper->{'VARS'}->{'symb'});
 	}
-    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
+    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
-             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') or
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
+	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
         #-- produce an output string
 	if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
@@ -1000,12 +1283,11 @@ ENDPART
 	    $selectionmade = 3;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
 	    $selectionmade = 4;
+	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
+	    $selectionmade = 4;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
 	    $selectionmade = 7;
 	}
-	my %form=();	   
-	$form{'grade_target'}='tex';
-	$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -1015,18 +1297,33 @@ ENDPART
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	my $prevassignment='';
-	&Apache::lonnet::delenv('form.counter');
-	&Apache::lonxml::init_counter();
+
+	&Apache::lonxml::clear_problem_counter();
+
+	my $pbreakresources = keys %page_breaks;
 	for (my $i=0;$i<=$#master_seq;$i++) {
-	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+
+	    # Note due to document structure, not allowed to put \newpage
+	    # prior to the first resource
+
+	    if (defined $page_breaks{$master_seq[$i]}) {
+		if($i != 0) {
+		    $result.="\\newpage\n";
+		}
+	    }
+	    my ($sequence,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    $urlp=&Apache::lonnet::clutter($urlp);
 	    $form{'symb'}=$master_seq[$i];
-	    my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
-	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
+
+	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
 	    if ($i==0) {$prevassignment=$assignment;}
 	    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);
@@ -1034,27 +1331,28 @@ ENDPART
 		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
 		    $flag_page_in_sequence = 'YES';
 		} 
-		my $lonidsdir=$r->dir_config('lonIDsDir');
-		my $envfile=$ENV{'user.environment'};
-		$envfile=~/\/([^\/]+)\.id$/;
-		$envfile=$1;
-		&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
-		my $current_counter=$ENV{'form.counter'};
+
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		    my %form;
-		    $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 $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($master_seq[$i]).'}\vskip 0 mm ';
+			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
+			    $body   .='\vskip 1 mm '.$answer;
+			    $body    = &encapsulate_minipage($body);
+			    $texversion .= $body;
 			} else {
 			    $texversion='';
 			}
@@ -1073,16 +1371,18 @@ 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 ';
+		    if ($numberofcolumns eq '1') {
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
+		    } else {
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
+		    }			
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
 	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
-		my %form;
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
+		$resources_printed .= $urlp.':';
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
@@ -1092,7 +1392,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 {
@@ -1103,13 +1404,15 @@ 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}/;
 	}	
 	$result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
+
+
      #-- prints assignments for whole class or for selected students  
 	 my $type;
 	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
@@ -1126,33 +1429,66 @@ 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
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %moreenv;
          $moreenv{'instructor_comments'}='hide';
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
+	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
 	 my $student_counter=-1;
+	 my $i = 0;
+	 my $last_section = (split(/:/,$students[0]))[2];
 	 foreach my $person (@students) {
-             my $duefile="/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+
+             my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	     if (-e $duefile) {
 		 my $temp_file = Apache::File->new('>>'.$duefile);
 		 print $temp_file "1969\n";
 	     }
 	     $student_counter++;
-	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
-	     my ($output,$fullname)=&print_resources($r,$helper,$person,$type,\%moreenv,\@master_seq,$flag_latex_header_remove);
+	     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);
@@ -1163,27 +1499,62 @@ ENDPART
 	 $result .= $print_array[0].'  \end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) { 
-	 my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-	 my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+	 my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
+	 my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
 	 my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
+	 my $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);
@@ -1199,10 +1570,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);
+				  \@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);
@@ -1226,24 +1603,25 @@ ENDPART
 	    my $urlp = $list_of_files[$i];
 	    $urlp=~s|//|/|;
 	    if ($urlp=~/\//) {
-		my %form;
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
+		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'rndseed'}=$rndseed;
 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
 		} else {
 		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
 		}
+		$resources_printed .= $urlp.':';
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		    my %form;
-		    $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 {
@@ -1286,19 +1664,27 @@ 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 =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
-	$result =~ s/\\textheight\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
-	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
-    }
+    $result = &latex_corrections($number_of_columns,$result,$selectionmade,
+				 $helper->{'VARS'}->{'ANSWER_TYPE'});
+    for (my $i=1;$i<=$#print_array;$i++) {
+	$print_array[$i] = 
+	    &latex_corrections($number_of_columns,$print_array[$i],
+			       $selectionmade, 
+			       $helper->{'VARS'}->{'ANSWER_TYPE'});
+    }
+    &Apache::lonnet::logthis("Resetting page e.g. height -> $helper->{'VARS'}->{'pagesize.height'}");
+    &Apache::lonnet::logthis("Before: $result \n--------------------------\n");
+    $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+    $result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+    $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+    $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+
+    &Apache::lonnet::logthis("After: $result \n----------------------------------\n");
+
 #-- 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 $!");
@@ -1321,7 +1707,8 @@ ENDPART
 	    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; 
@@ -1338,9 +1725,9 @@ ENDPART
 	if ($#student_names>-1) {
 	    $student_names=$student_names[0].'_ENDPERSON_';
 	} else {
-	    my $fullname = &get_name($ENV{'user.name'},$ENV{'user.domain'});
-	    $student_names=join(':',$ENV{'user.name'},$ENV{'user.domain'},
-				$ENV{'request.course.sec'},$fullname).
+	    my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
+	    $student_names=join(':',$env{'user.name'},$env{'user.domain'},
+				$env{'request.course.sec'},$fullname).
 				    '_ENDPERSON_'.'_END_';
 	}
     }
@@ -1348,7 +1735,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'};
@@ -1357,53 +1744,59 @@ 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);
+	    }
 	}
     }
 }
 
 sub print_resources {
-    my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header)=@_;
+    my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
+	$LaTeXwidth)=@_;
     my $current_output = ''; 
+    my $printed = '';
     my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);
     my $namepostfix;
@@ -1411,36 +1804,66 @@ sub print_resources {
 	$namepostfix="\\\\Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+    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 @format_array = split(/\|/,$helper->{'VARS'}->{'FORMAT'});
+    my $columns_in_format = $format_array[1];
+    #
+    #   end each student with a 
+    #   Special that allows the post processor to even out the page
+    #   counts later.  Nasty problem this... it would be really
+    #   nice to put the special in as a postscript comment
+    #   e.g. \special{ps:\ENDOFSTUDENTSTAMP}  unfortunately,
+    #   The special gets passed the \ and dvips puts it in the output file
+    #   so we will just rely on prntout.pl to strip  ENDOFSTUDENTSTAMP from the
+    #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
+    #
+
     foreach my $curresline (@{$master_seq})  {
+	if (defined $page_breaks{$curresline}) {
+	    if($i != 0) {
+		$current_output.= "\\newpage\n";
+	    }
+	}
+	$i++;
 	if ( !($type eq 'problems' && 
 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
-		if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
-		    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 ($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);
+
 		    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 $body   ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\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') {
@@ -1450,21 +1873,18 @@ sub print_resources {
 		    }
 		    $current_output .= $rendered;		    
 		} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
-		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
-		    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'};
+		    $printed .= $curresline.':';
+		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+
 		    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 {
@@ -1482,51 +1902,56 @@ sub print_resources {
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     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 /;
+	if ($columns_in_format == 1) {
+	    $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 /;
+	} else {
+	    	    $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fancyhead[LO]{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$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;
+	if ($columns_in_format == 1) {
+	    $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;
+	} else {
+	   $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\\fancyhead[LO]{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
+	}
     }
-    return ($current_output,$fullname);
+    #
+    #  Close the student bracketing.
+    #
+    $current_output .= "\\special{ps:\nENDOFSTUDENTSTAMP\n}";
+    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'});
-    
-#	my $key; 
-#	foreach $key (keys %parmhash) {
-#	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
-#	}
-#	return OK;
+    my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+ 
+
 
+
+    #  If a figure conversion queue file exists for this user.domain
+    # we delete it since it can only be bad (if it were good, printout.pl
+    # would have deleted it the last time around.
+
+    my $conversion_queuefile = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
+    if(-e $conversion_queuefile) {
+	unlink $conversion_queuefile;
+    }
     &output_data($r,$helper,\%parmhash);
     return OK;
 } 
@@ -1540,13 +1965,27 @@ 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('pav',$env{'request.course.id'});
+    if (!$perm{'pfo'}) {
+	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
+		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+    }
+}
 
 sub printHelper {
     my $r = shift;
 
     if ($r->header_only) {
-        if ($ENV{'browser.mathml'}) {
+        if ($env{'browser.mathml'}) {
             &Apache::loncommon::content_type($r,'text/xml');
         } else {
             &Apache::loncommon::content_type($r,'text/html');
@@ -1556,7 +1995,7 @@ sub printHelper {
     }
 
     # Send header, nocache
-    if ($ENV{'browser.mathml'}) {
+    if ($env{'browser.mathml'}) {
         &Apache::loncommon::content_type($r,'text/xml');
     } else {
         &Apache::loncommon::content_type($r,'text/html');
@@ -1580,29 +2019,58 @@ sub printHelper {
     $helper->declareVar('assignment');
     $helper->declareVar('style_file');
     $helper->declareVar('student_sort');
+    $helper->declareVar('FINISHPAGE');
+    $helper->declareVar('PRINT_TYPE');
+    $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.
+    #
+
+    # $helper->{VARS}->{FINISHPAGE} = '';
+    
+    &Apache::loncommon::restore_course_settings('print',
+						{'pagebreaks'  => 'scalar',
+					         'lastprinttype' => 'scalar'});
+    
+    
+    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.
     # Detect whether we're coming from construction space
-    if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
+    if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "~$1/$2";
         $helper->{VARS}->{'construction'} = 1;
     } else {
-        if ($ENV{'form.postdata'}) {
-            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+        if ($env{'form.postdata'}) {
+            $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
         }
-        if ($ENV{'form.symb'}) {
-            $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+        if ($env{'form.symb'}) {
+            $helper->{VARS}->{'symb'} = $env{'form.symb'};
         }
-        if ($ENV{'form.url'}) {
+        if ($env{'form.url'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
         }
+
     }
 
-    if ($ENV{'form.symb'}) {
-        $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+    if ($env{'form.symb'}) {
+        $helper->{VARS}->{'symb'} = $env{'form.symb'};
     }
-    if ($ENV{'form.url'}) {
+    if ($env{'form.url'}) {
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
 
     }
@@ -1634,17 +2102,14 @@ sub printHelper {
         }
         $subdir = &Apache::lonnet::filelocation("", $url);
     }
-    if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
-	$helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
+    if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
+	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
     }
-    if (!$helper->{VARS}->{'probstatus'} && $ENV{'form.problemtype'}) {
-	$helper->{VARS}->{'probstatus'}=$ENV{'form.problemtype'};
+    if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+	$helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
     }
 
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
-    my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or
-			   $ENV{'request.role'}=~m/^in\./ or
-			   $ENV{'request.role'}=~m/^ta\./);
 
     Apache::lonhelper::registerHelperTags();
 
@@ -1686,12 +2151,11 @@ sub printHelper {
 
     $helper->declareVar('SEQUENCE');
 
-    # Useful for debugging: Dump the help vars
-    #$r->print(Dumper($helper->{VARS}));
-    #$r->print($map);
+
 
     # If we're in a sequence...
     if (($helper->{'VARS'}->{'construction'} ne '1') &&
+
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
@@ -1708,6 +2172,7 @@ sub printHelper {
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 
@@ -1719,6 +2184,7 @@ sub printHelper {
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 HELPERFRAGMENT
@@ -1726,11 +2192,13 @@ HELPERFRAGMENT
 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
     }
 
-    # If the user is priviledged, allow them to print all 
-    # problems in the course, optionally for selected students
-    if ($userPriviledged && 
+    # 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 ($perm{'pfo'} && 
         ($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'];
          &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>
@@ -1740,6 +2208,17 @@ HELPERFRAGMENT
       <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
+    </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' />
     </resource>
   </state>
 ALL_PROBLEMS
@@ -1748,14 +2227,29 @@ ALL_PROBLEMS
 	    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'];
 	}
+
+	# 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' />
       </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>
@@ -1763,44 +2257,137 @@ 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" relateddefault="all">
+            Specify Number:</choice>
+    </choices>
+    </state>
 RESOURCE_SELECTOR
 
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
-      <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+      <message><b>Select 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'};
-	my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
 	my $namechoice='<choice></choice>';
 	foreach my $name (sort {uc($a) cmp uc($b)} @names) {
 	    if ($name =~ /^error: 2 /) { next; }
+	    if ($name =~ /^type\0/) { next; }
 	    $namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
 	}
+
+
+	my %code_values;
+	my %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 = "<choice></choice>\n";
+	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 .='   
+             <exec>
+               push(@{$state->{CHOICES}},@{$helper->{DATA}{ALL_CODE_CHOICES}});
+            </exec>
+            '.$/;
+	}
+
+	
+	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%' /><b>Number of anonymous assignments to print?</b></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
-    <message><br /><b>Names to store the CODEs under for later:</b></message>
+    <nextstate>SELECT_PROBLEMS</nextstate>
+    <message><table><tr><td><b>Number of anonymous assignments to print:</b></td><td></message>
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+       <validator>
+	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
+	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+            !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	    return "You need to specify the number of assignments to print";
+	}
+	return undef;
+       </validator>
+    </string>
+    <message></td></tr><tr><td></message>
+    <message><b>Names to store the CODEs under for later:</b></message>
+    <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
-    <message><hr width='33%' /></message>
+    <message></td></tr><tr><td></message>
+    <message><b>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"><hr width='33%' /></td></tr><tr><td></message>
+    <message></td></tr><tr><td></message>
+    <message><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 colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+    <message><b>Choose single code from list</b></message>
+    <message></td><td></message>
+    <choices variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+        $code_selection
+    </choices>
+    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
     <message><b>Reprint a set of saved CODEs:</b></message>
+    <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">
         $namechoice
     </dropdown>
+    <message></td></tr></table></message>
     <message><hr width='33%' /></message>
-    $resource_selector
   </state>
+  $resource_selector
 CHOOSE_ANON1
 
 
@@ -1811,13 +2398,19 @@ CHOOSE_ANON1
 	    
 
 	$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' />
       </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>
@@ -1825,42 +2418,92 @@ 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" relateddefault="all">
+           Specify Number:</choice>
+    </choices>
+    </state>
 RESOURCE_SELECTOR
 
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
-    <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
     <choices variable='student_sort'>
       <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><hr width='33%' /><b>Number of anonymous assignments to print?</b></message>
-    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
-    <message><br /><b>Names to store the CODEs under for later:</b></message>
+    <nextstate>SELECT_RESOURCES</nextstate>
+    <message><table><tr><td><b>Number of anonymous assignments to print:</b></td><td></message>
+    <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+       <validator>
+	if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
+	    !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
+	    !\$helper->{'VARS'}{'SINGLE_CODE'}                   &&
+	    !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+	    return "You need to specify the number of assignments to print";
+	}
+	return undef;
+       </validator>
+    </string>
+    <message></td></tr><tr><td></message>
+    <message><b>Names to store the CODEs under for later:</b></message>
+    <message></td><td></message>
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
-    <message><hr width='33%' /></message>
+    <message></td></tr><tr><td></message>
+    <message><b>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"><hr width='33%' /></td></tr><tr><td></message>
+    <message></td></tr><tr><td></message>
+    <message><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 colspan="2"><hr width='33%' /></td></tr><tr><td></message>
+    <message><b>Choose single code from list</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_SELECTED_FROM_LIST" multichoice="0" allowempty="0">
+        $code_selection
+    </dropdown>
+    <message></td></tr><tr><td colspan="2"><hr width='33%' /></td></tr><tr><td></message>
     <message><b>Reprint a set of saved CODEs:</b></message>
+    <message></td><td></message>
     <dropdown variable="REUSE_OLD_CODES">
         $namechoice
     </dropdown>
+    <message></td></tr></table></message>
     <message><hr width='33%' /></message>
-    $resource_selector
   </state>
+    $resource_selector
 CHOOSE_ANON2
     }
 
     # FIXME: That RE should come from a library somewhere.
-    if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {    
+    if ((((&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}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
 
         my $f = '$filename';
@@ -1900,6 +2543,8 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
+      <choicefunc>return \$res->hasResource(\$res,sub { return !\$_[0]->is_sequence() },0,0);
+	</choicefunc>
       </resource>
     </state>
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
@@ -1910,6 +2555,7 @@ CHOOSE_FROM_SUBDIR
       <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 CHOOSE_FROM_ANY_SEQUENCE
@@ -1922,14 +2568,13 @@ CHOOSE_FROM_ANY_SEQUENCE
     Apache::lonhelper::message->new();
     $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = 'PRINT_TYPE';
-    $helper->declareVar('PRINT_TYPE');
     $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();
 
     my $startedTable = 0; # have we started an HTML table yet? (need
                           # to close it later)
 
-    if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
+    if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
 	addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
         $paramHash = Apache::lonhelper::getParamHash();
@@ -1938,15 +2583,14 @@ CHOOSE_FROM_ANY_SEQUENCE
         $paramHash->{CHOICES} = [
                                    ['Without Answers', 'yes'],
                                    ['With Answers', 'no'],
-                                   ['Only Answers', 'only'],
-                                   ['As Exam Problem', 'exam']
+                                   ['Only Answers', 'only']
                                 ];
         Apache::lonhelper::dropdown->new();
 	addMessage("</td></tr>");
 	$startedTable = 1;
     }
 
-    if ($ENV{'request.role.adv'}) {
+    if ($perm{'pav'}) {
 	if (!$startedTable) {
 	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
 	    $startedTable = 1;
@@ -1996,10 +2640,19 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
 	    addMessage("</td></tr>");
+
+	    addMessage("<tr><td align = 'right'>  </td><td>");
+	    $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{'multichoice'} = "true";
+	    $paramHash->{'allowempty'}  = "true";
+	    $paramHash->{'variable'}   = "showallfoils";
+	    $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+	    Apache::lonhelper::choices->new();
+	    addMessage("</td></tr>");
 	}
 
 	if ($helper->{'VARS'}->{'construction'}) { 
-	    my $stylevalue=$ENV{'construct.style'};
+	    my $stylevalue=$env{'construct.style'};
 	    my $xmlfrag .= <<"RNDSEED";
 	    <message><tr><td align='right'>Use random seed:  </td><td></message>
 	    <string variable="curseed" size="15" maxlength="15">
@@ -2008,12 +2661,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'};
-	}
+	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
+	    
+	} 
     }
 
 
@@ -2033,6 +2690,7 @@ RNDSEED
 
     $helper->process();
 
+
     # MANUAL BAILOUT CONDITION:
     # If we're in the "final" state, bailout and return to handler
     if ($helper->{STATE} eq 'FINAL') {
@@ -2040,7 +2698,9 @@ RNDSEED
     }    
 
     $r->print($helper->display());
-
+    if ($helper->{STATE} eq 'START') {
+	&recently_generated($r);
+    }
     &Apache::lonhelper::unregisterHelperTags();
 
     return OK;
@@ -2080,12 +2740,16 @@ no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
 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
@@ -2121,8 +2785,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">
@@ -2140,8 +2804,9 @@ STATEHTML
     $result .= "</select></td><td>\n";
     $result .= "<select name='${var}.paper'>\n";
 
-    my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
-    my $DefaultPaperSize=$parmhash{'default_paper_size'};
+    my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+    my $DefaultPaperSize=lc($parmhash{'default_paper_size'});
+    $DefaultPaperSize=~s/\s//g;
     if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
     $i = 0;
     foreach (@paperSize) {
@@ -2164,8 +2829,8 @@ sub postprocess {
     my $var = $self->{'variable'};
     my $helper = Apache::lonhelper->getHelper();
     $helper->{VARS}->{$var} = 
-        $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
-        $ENV{"form.$var.paper"};
+        $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
+        $env{"form.$var.paper"};
     return 1;
 }
 
@@ -2195,7 +2860,7 @@ is no tag interface. You actually pass p
 =cut
 
 use Apache::lonhelper;
-
+use Apache::lonnet;
 no strict;
 @ISA = ("Apache::lonhelper::element");
 use strict;
@@ -2233,6 +2898,12 @@ sub render {
         $result .= '<br /><font color="#FF0000">' . $self->{ERROR_MSG} . '</font><br />';
     }
 
+    my $width = 18;
+    my $format = $helper->{VARS}->{$self->{'formatvar'}};
+    if (substr($format, 2, 1) ne '1') {
+	$width = 9;
+    }
+
     $result .= <<ELEMENTHTML;
 
 <p>How should the column be formatted?</p>
@@ -2240,7 +2911,7 @@ sub render {
 <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='$width' size='4'></td>
     <td align='left'>
       <select name='$var.widthunit'>
         <option>cm</option><option>in</option>
@@ -2281,9 +2952,9 @@ sub preprocess {
     my $helper = Apache::lonhelper::getHelper();
 
     my $format = $helper->{VARS}->{$self->{'formatvar'}};
-    if (substr($format, 2, 1) ne '1') {
-        $helper->changeState($self->{NEXTSTATE});
-    }
+#    if (substr($format, 2, 1) ne '1') {
+#        $helper->changeState($self->{NEXTSTATE});
+#    }
    
     return 1;
 }
@@ -2293,12 +2964,12 @@ sub postprocess {
 
     my $var = $self->{'variable'};
     my $helper = Apache::lonhelper->getHelper();
-    my $width = $helper->{VARS}->{$var .'.width'} = $ENV{"form.${var}.width"}; 
-    my $height = $helper->{VARS}->{$var .'.height'} = $ENV{"form.${var}.height"}; 
-    my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $ENV{"form.${var}.lmargin"}; 
-    $helper->{VARS}->{$var .'.widthunit'} = $ENV{"form.${var}.widthunit"}; 
-    $helper->{VARS}->{$var .'.heightunit'} = $ENV{"form.${var}.heightunit"}; 
-    $helper->{VARS}->{$var .'.lmarginunit'} = $ENV{"form.${var}.lmarginunit"}; 
+    my $width = $helper->{VARS}->{$var .'.width'} = $env{"form.${var}.width"}; 
+    my $height = $helper->{VARS}->{$var .'.height'} = $env{"form.${var}.height"}; 
+    my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $env{"form.${var}.lmargin"}; 
+    $helper->{VARS}->{$var .'.widthunit'} = $env{"form.${var}.widthunit"}; 
+    $helper->{VARS}->{$var .'.heightunit'} = $env{"form.${var}.heightunit"}; 
+    $helper->{VARS}->{$var .'.lmarginunit'} = $env{"form.${var}.lmarginunit"}; 
 
     my $error = '';