--- loncom/interface/lonprintout.pm	2005/12/19 22:30:01	1.409
+++ loncom/interface/lonprintout.pm	2009/07/23 10:53:03	1.559
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.409 2005/12/19 22:30:01 foxr Exp $
+# $Id: lonprintout.pm,v 1.559 2009/07/23 10:53:03 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -22,7 +22,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # /home/httpd/html/adm/gpl.txt
-#
 # http://www.lon-capa.org/
 #
 #
@@ -38,11 +37,349 @@ use Apache::grades;
 use Apache::edit;
 use Apache::File();
 use Apache::lonnavmaps;
-use Apache::lonratedt;
+use Apache::admannotations;
+use Apache::lonenc;
+use Apache::entities;
+use Apache::londefdef;
+
+use File::Basename;
+
+use HTTP::Response;
+
+use LONCAPA::map();
 use POSIX qw(strftime);
 use Apache::lonlocal;
+use Carp;
+use LONCAPA;
 
 my %perm;
+my %parmhash;
+my $resources_printed;
+
+# Global variables that describe errors in ssi calls detected  by ssi_with_retries.
+#
+
+my $ssi_error;			# True if there was an ssi error.
+my $ssi_last_error_resource;	# The resource URI that could not be fetched.
+my $ssi_last_error;		# The error text from the server. (e.g. 500 Server timed out).
+
+#
+#  Our ssi max retry count.
+#
+
+my $ssi_retry_count = 5;	# Some arbitrary value.
+
+
+#  Font size:
+
+my $font_size = 'normalsize';	# Default is normalsize...
+
+
+# Fetch the contents of a resource, uninterpreted.
+# This is used here to fetch a latex file to be included
+# verbatim into the printout<
+# NOTE: Ask Guy if there is a lonnet function similar to this?
+#
+# Parameters:
+#   URL of the file
+#
+sub fetch_raw_resource {
+    my ($url) = @_;
+
+    my $filename  = &Apache::lonnet::filelocation("", $url);
+    my $contents  = &Apache::lonnet::getfile($filename);
+
+    if ($contents == -1) {
+	return "File open failed for $filename";      # This will bomb the print.
+    }
+    return $contents;
+
+    
+}
+
+#  Fetch the annotations associated with a URL and 
+#  put a centered 'annotations:' title.
+#  This is all suppressed if the annotations are empty.
+#
+sub annotate {
+    my ($symb) = @_;
+
+    my $annotation_text = &Apache::loncommon::get_annotation($symb, 1);
+
+
+    my $result = "";
+
+    if (length($annotation_text) > 0) {
+	$result .= '\\hspace*{\\fill} \\\\[\\baselineskip] \textbf{Annotations:} \\\\ ';
+	$result .= "\n";
+	$result .= &Apache::lonxml::latex_special_symbols($annotation_text,"");	# Escape latex.
+	$result .= "\n\n";
+    }
+    return $result;
+}
+
+#
+#   Set a global document font size:
+#   This is done by replacing \begin{document}
+#   with \begin{document}{\some-font-directive
+#   and \end{document} with
+#   }\end{document
+#
+sub set_font_size {
+
+    my ($text) = @_;
+
+    $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
+    $text =~ s/\\end{document}/}\\end{document}/;
+    return $text;
+
+
+}
+
+# include_pdf - PDF files are included into the 
+# output as follows:
+#  - The PDF, if necessary, is replicated.
+#  - The PDF is added to the list of files to convert to postscript (along with the images).
+#  - The LaTeX is added to include the final converted postscript in the file as an included
+#    job.  The assumption is that the includedpsheader.ps header will be included.
+#
+# Parameters:
+#   pdf_uri   - URI of the PDF file to include.
+#   
+# Returns:
+#  The LaTeX to include.
+#
+# Assumptions:
+#    The uri is actually a PDF file
+#    The postscript will have the includepsheader.ps included.
+#
+#
+sub include_pdf {
+    my ($pdf_uri) = @_;
+
+    # Where is the file? If not local we'll need to repcopy it:'
+
+    my $file = &Apache::lonnet::filelocation('', $pdf_uri);
+    if (! -e $file) {
+	&Apache::lonnet::repcopy($file);
+	$file = &Apache::lonnet::filelocation('',$pdf_uri);
+    }
+
+    #  The file isn ow replicated locally.. or it did not exist in the first place
+    # (unlikely).  If it did exist, add the pdf to the set of files/images that
+    # need tob e converted for this print job:
+
+    $file =~ s|(.*)/res/|/home/httpd/html/res/|;
+
+    open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+    print FILE ("$file\n");
+    close (FILE);
+
+    # Construct the special to put out.  To do this we need to get the
+    # resulting filename after conversion.  The file will have the same name
+    # but will be in the user's spool directory with converted images.
+
+    my $dirname = "/home/httpd/prtspool/$env{'user.name'}/";
+    my ( $base, $path,  $ext) = &fileparse($file, '.pdf');
+#    my $destname = $dirname.'/'.$base.'.eps'; # Not really an eps but easier in printout.pl
+    $base =~ s/ /\_/g;
+
+
+    my $output = &print_latex_header();
+    $output    .= '\special{ps: _begin_job_ ('
+	.$base.'.pdf.eps'.
+	')run _end_job_}';
+
+    return $output;
+
+
+}
+
+
+#
+#   ssi_with_retries- Does the server side include of a resource.
+#                      if the ssi call returns an error we'll retry it up to
+#                      the number of times requested by the caller.
+#                      If we still have a proble, no text is appended to the
+#                      output and we set some global variables.
+#                      to indicate to the caller an SSI error occurred.  
+#                      All of this is supposed to deal with the issues described
+#                      in LonCAPA BZ 5631 see:
+#                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
+#                      by informing the user that this happened.
+#
+# Parameters:
+#   resource   - The resource to include.  This is passed directly, without
+#                interpretation to lonnet::ssi.
+#   form       - The form hash parameters that guide the interpretation of the resource
+#                
+#   retries    - Number of retries allowed before giving up completely.
+# Returns:
+#   On success, returns the rendered resource identified by the resource parameter.
+# Side Effects:
+#   The following global variables can be set:
+#    ssi_error                - If an unrecoverable error occurred this becomes true.
+#                               It is up to the caller to initialize this to false
+#                               if desired.
+#    ssi_last_error_resource  - If an unrecoverable error occurred, this is the value
+#                               of the resource that could not be rendered by the ssi
+#                               call.
+#    ssi_last_error           - The error string fetched from the ssi response
+#                               in the event of an error.
+#
+sub ssi_with_retries {
+    my ($resource, $retries, %form) = @_;
+
+    my $target = $form{'grade_target'};
+    my $aom    = $form{'answer_output_mode'};
+
+
+
+    my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
+    if (!$response->is_success) {
+	$ssi_error               = 1;
+	$ssi_last_error_resource = $resource;
+	$ssi_last_error          = $response->code . " " . $response->message;
+        $content='\section*{!!! An error occurred !!!}';	
+	&Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
+    }
+
+    return $content;
+
+}
+
+sub get_student_view_with_retries {
+    my ($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv)=@_;
+
+    my ($content, $response) = &Apache::loncommon::get_student_view_with_retries($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv);
+    if (!$response->is_success) {
+        $ssi_error               = 1;
+        $ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
+        $ssi_last_error          = $response->code . " " . $response->message;
+        $content='\section*{!!! An error occurred !!!}';
+        &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
+    }
+    return $content;
+
+}
+
+#
+#   printf_style_subst  item format_string repl
+#  
+# Does printf style substitution for a format string that
+# can have %[n]item in it.. wherever, %[n]item occurs,
+# rep is substituted in format_string.  Note that
+# [n] is an optional integer length.  If provided,
+# repl is truncated to at most [n] characters prior to 
+# substitution.
+#
+sub printf_style_subst {
+    my ($item, $format_string, $repl) = @_;
+    my $result = "";
+    while ($format_string =~ /(%)(\d*)\Q$item\E/g ) {
+	my $fmt = $1;
+	my $size = $2;
+	my $subst = $repl;
+	if ($size ne "") {
+	    $subst = substr($subst, 0, $size);
+	    
+	    #  Here's a nice edge case.. supose the end of the
+	    #  substring is a \.  In that case may have  just
+	    #  chopped off a TeX escape... in that case, we append
+	    #   " " for the trailing character, and let the field 
+	    #  spill over a bit (sigh).
+	    #  We don't just chop off the last character in order to deal
+	    #  with one last pathology, and that would be if substr had
+	    #  trimmed us to e.g. \\\  
+
+
+	    if ($subst =~ /\\$/) {
+		$subst .= " ";
+	    }
+	}
+	my $item_pos = pos($format_string);
+	$result .= substr($format_string, 0, $item_pos - length($size) -2) . $subst;
+        $format_string = substr($format_string, pos($format_string));
+    }
+
+    # Put the residual format string into the result:
+
+    $result .= $format_string;
+
+    return $result;
+}
+
+
+# Format a header according to a format.  
+# 
+
+# Substitutions:
+#     %a    - Assignment name.
+#     %c    - Course name.
+#     %n    - Student name.
+#     %s    - The section if it is supplied.
+#
+sub format_page_header {
+    my ($width, $format, $assignment, $course, $student, $section) = @_;
+
+    
+    $width = &recalcto_mm($width); # Get width in mm.
+    #  Default format?
+
+    if ($format eq '') {
+	# For the default format, we may need to truncate
+	# elements..  To do this we need to get the page width.
+	# we assume that each character is about 2mm in width.
+	# (correct for the header text size??).  We ignore
+	# any formatting (e.g. boldfacing in this).
+	# 
+	# - Allow the student/course to be one line.
+	#   but only truncate the course.
+	# - Allow the assignment to be 2 lines (wrapped).
+	#
+	my $chars_per_line = $width/2; # Character/textline.
+	
+
+
+	my $name_length    = int($chars_per_line *3 /4);
+	my $sec_length     = int($chars_per_line / 5);
+
+	$format  = "%$name_length".'n';
+
+	if ($section) {
+	    $format .=  ' - Sec: '."%$sec_length".'s';
+	}
+
+	$format .= '\\\\%c \\\\ %a';
+        
+
+    }
+    # An open question is how to handle long user formatted page headers...
+    # A possible future is to support e.g. %na so that the user can control
+    # the truncation of the elements that can appear in the header.
+    #
+    $format =  &printf_style_subst("a", $format, $assignment);
+    $format =  &printf_style_subst("c", $format, $course);
+    $format =  &printf_style_subst("n", $format, $student);
+    $format =  &printf_style_subst("s", $format, $section);
+    
+    
+    # If the user put %'s in the format string, they  must be escaped
+    # to \% else LaTeX will think they are comments and terminate
+    # the line.. which is bad!!!
+    
+    # If the user has role author, $course and $assignment are empty so
+    # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
+    if($format =~ /\\\\\s\\\\\s/) {
+        #TODO find sensible caption for page header
+        my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
+        $format =~ s/\\\\\s\\\\\s/$testPrintout/;
+    }
+    
+
+    return $format;
+    
+}
 
 #
 #   Convert a numeric code to letters
@@ -60,7 +397,7 @@ sub num_to_letters {
 sub letters_to_num {
     my ($letters) = @_;
     my @letters = split('', uc($letters));
-    my %substitution;
+   my %substitution;
     my $digit = 0;
     foreach my $letter ('A'..'J') {
 	$substitution{$letter} = $digit;
@@ -143,8 +480,8 @@ sub is_valid_alpha_code {
 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 @lines = &Apache::grades::get_scantronformat_file();
+    foreach my $line (@lines) {
 	my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
 	if($name eq $code_option) {
 	    $code_length = $length;
@@ -226,9 +563,55 @@ sub latex_header_footer_remove {
     $text =~ s/\\documentclass([^&]*)\\begin{document}//;
     return $text;
 }
+#
+#  If necessary, encapsulate text inside 
+#  a minipage env.
+#  necessity is determined by the problem_split param.
+#
+sub encapsulate_minipage {
+    my ($text) = @_;
+    if (!($env{'form.problem.split'} =~ /yes/i)) {
+	$text = '\begin{minipage}{\textwidth}'.$text.'\end{minipage}';
+    }
+    return $text;
+}
+#
+#  The NUMBER_TO_PRINT and SPLIT_PDFS
+#  variables interact, this sub looks at these two parameters
+#  and comes up with a final value for NUMBER_TO_PRINT which can be:
+#     all     - if SPLIT_PDFS eq 'all'.
+#     1       - if SPLIT_PDFS eq 'oneper'
+#     section - if SPLIT_PDFS eq 'sections'
+#     <unchanged> - if SPLIT_PDFS eq 'usenumber'
+#
+sub adjust_number_to_print {
+    my $helper = shift;
+
+    my $split_pdf = $helper->{'VARS'}->{'SPLIT_PDFS'};
+    
+    if ($split_pdf eq 'all') {
+	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'all';
+    } elsif ($split_pdf eq 'oneper') {
+	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 1;
+    } elsif ($split_pdf eq 'sections') {
+	$helper->{'VARS'}->{'NUMBER_TO_PRINT'} = 'section';
+    } elsif ($split_pdf eq 'usenumber') {
+	#  Unmodified.
+    } else {
+	# Error!!!!
+	
+	croak "bad SPLIT_PDFS: $split_pdf in lonprintout::adjust_number_to_print";
+
+    }
+}
 
 
 sub character_chart {
+    my $result = shift;
+    return  &Apache::entities::replace_entities($result);
+}
+
+sub old_character_chart {
     my $result = shift;	
     $result =~ s/&\#0?0?(7|9);//g;
     $result =~ s/&\#0?(10|13);//g;
@@ -336,7 +719,7 @@ sub character_chart {
     $result =~ s/&\#147;/\`\`/g;
     $result =~ s/&\#148;/\'\'/g;
     $result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;
-    $result =~ s/&\#150;/--/g;
+    $result =~ s/&(\#150|\#8211);/--/g;
     $result =~ s/&\#151;/---/g;
     $result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
     $result =~ s/&\#153;/\\texttrademark /g;
@@ -350,7 +733,7 @@ sub character_chart {
     $result =~ s/&(\#165|yen);/\\textyen /g;
     $result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
     $result =~ s/&(\#167|sect);/\\textsection /g;
-    $result =~ s/&(\#168|uml);/\\texthighdieresis /g;
+    $result =~ s/&(\#168|uml);/\\"\{\} /g;
     $result =~ s/&(\#169|copy);/\\copyright /g;
     $result =~ s/&(\#170|ordf);/\\textordfeminine /g;
     $result =~ s/&(\#172|not);/\\ensuremath\{\\neg\}/g;
@@ -361,7 +744,7 @@ sub character_chart {
     $result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
     $result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
     $result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;
-    $result =~ s/&(\#180|acute);/\\textacute /g;
+    $result =~ s/&(\#180|acute);/\\'\{\} /g;
     $result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;
     $result =~ s/&(\#182|para);/\\P/g;
     $result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;
@@ -543,6 +926,29 @@ sub character_chart {
     $result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
     $result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
     $result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
+#   Chemically useful 'things' contributed by Hon Kie (bug 4652).
+
+    $result =~ s/&\#8636;/\\ensuremath\{\\leftharpoonup\}/g;
+    $result =~ s/&\#8637;/\\ensuremath\{\\leftharpoondown\}/g;
+    $result =~ s/&\#8640;/\\ensuremath\{\\rightharpoonup\}/g;
+    $result =~ s/&\#8641;/\\ensuremath\{\\rightharpoondown\}/g;
+    $result =~ s/&\#8652;/\\ensuremath\{\\rightleftharpoons\}/g;
+    $result =~ s/&\#8605;/\\ensuremath\{\\leadsto\}/g;
+    $result =~ s/&\#8617;/\\ensuremath\{\\hookleftarrow\}/g;
+    $result =~ s/&\#8618;/\\ensuremath\{\\hookrightarrow\}/g;
+    $result =~ s/&\#8614;/\\ensuremath\{\\mapsto\}/g;
+    $result =~ s/&\#8599;/\\ensuremath\{\\nearrow\}/g;
+    $result =~ s/&\#8600;/\\ensuremath\{\\searrow\}/g;
+    $result =~ s/&\#8601;/\\ensuremath\{\\swarrow\}/g;
+    $result =~ s/&\#8598;/\\ensuremath\{\\nwarrow\}/g;
+
+    # Left/right quotations:
+
+    $result =~ s/&(ldquo|#8220);/\`\`/g;
+    $result =~ s/&(rdquo|#8221);/\'\'/g;
+
+
+
     return $result;
 }
 
@@ -551,18 +957,18 @@ sub character_chart {
 my %page_formats=
     ('letter' => {
 	 'book' => {
-	     '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm'],
-	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
+	     '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
+	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
 	 },
 	 'album' => {
-	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],
-	     '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
+	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.55 in','0.394 in'],
+	     '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
 	 },
      },
      'legal' => {
 	 'book' => {
 	     '1' => ['7.1 in','13 in',,'-0.57 in','-0.57 in','-0.5 in'],
-	     '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']
+	     '2' => ['3.66 in','13 in','-0.57 in','-0.57 in','-0.5 in']
 	 },
 	 'album' => {
 	     '1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
@@ -611,12 +1017,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','-1.397 cm','-2.11 cm','-1.27 cm'],
+	     '2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']
 	 },
 	 'album' => {
-	     '1' => ['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' => ['21.59 cm','19.558 cm','-1.397cm','-2.11 cm','0 cm'],
+	     '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
 	 },
      },
      'a5' => {
@@ -660,14 +1066,16 @@ 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');
+	my $sec = $env{'request.course.sec'};
+	    
     }
     return $courseidinfo;
 }
@@ -675,30 +1083,39 @@ sub get_course {
 sub page_format_transformation {
     my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment,$tableofcontents,$indexlist,$selectionmade) = @_; 
     my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
+
     if ($selectionmade eq '4') {
-	$assignment='Problems from the Whole Course';
+	if ($choice eq 'all_problems') {
+	    $assignment='Problems from the Whole Course';
+	} else {
+	    $assignment='Resources from the Whole Course';
+	}
     } else {
 	$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
     }
     ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = &page_format($papersize,$layout,$numberofcolumns,$topmargin);
+
+
     my $name = &get_name();
     my $courseidinfo = &get_course();
-    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+    my $header_text  = $parmhash{'print_header_format'};
+    $header_text     = &format_page_header($textwidth, $header_text, $assignment,
+					   $courseidinfo, $name);
     my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
     my $fancypagestatement='';
     if ($numberofcolumns eq '2') {
-	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
     } else {
-	$fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
     }
     if ($layout eq 'album') {
-	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
+	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
     } elsif ($layout eq 'book') {
 	if ($choice ne 'All class print') { 
-	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
+	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\usepackage{booktabs}\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
 	} else {
-	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
+	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
 	}
 	if ($papersize eq 'a4') {
 	    $text =~ s/(\\begin{document})/$1\\special{papersize=210mm,297mm}/;
@@ -733,6 +1150,8 @@ sub details_for_menu {
     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
     my $name_of_resource = &Apache::lonnet::gettitle($postdata);
     my $symbolic = &Apache::lonnet::symbread($postdata);
+    return if ( $symbolic eq '');
+
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence = &Apache::lonnet::gettitle($map);
@@ -748,17 +1167,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,$answer_mode) = @_;
-
 #    $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
-    $result =~ s/\$number_of_columns/$number_of_columns/g;
+    my $copyright = &copyright_line();
     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/;
+	$result =~ s/(\\end{document})/\\strut\\vskip 0 mm $copyright $end_of_student $1/;
     } else {
-	$result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License  $1/;
+	$result =~ s/(\\end{document})/\\strut\\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     
@@ -781,7 +1204,6 @@ sub latex_corrections {
     }
     $result =~ s/(\\end{tabular})\s*\\vskip 0 mm/$1/g;
     $result =~ s/(\\begin{enumerate})\s*\\noindent/$1/g;
-
     return $result;
 }
 
@@ -816,29 +1238,8 @@ sub IndexCreation {
 
 sub print_latex_header {
     my $mode=shift;
-    my $output='\documentclass[letterpaper,twoside]{article}';
-    if (($mode eq 'batchmode') || (!$perm{'pav'})) {
-	$output.='\batchmode';
-    }
-    $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\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".
-	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
-	     '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'."\n".
-	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
-	     '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'."\n".
-	     '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'."\n".
-	     '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'."\n".
-	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'."\n".
-	     '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'."\n".
-	     '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'."\n".
-	     '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
-	     '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}'."\n";
-    return $output;	     
+
+    return &Apache::londefdef::latex_header($mode);
 }
 
 sub path_to_problem {
@@ -894,11 +1295,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;
     }
@@ -906,6 +1310,180 @@ sub unsupported {
     return $result;
 }
 
+#
+#  Map from helper layout style to the book/album:
+#
+sub map_laystyle {
+    my ($laystyle) = @_;
+    if ($laystyle eq 'L') {
+	$laystyle='album';
+    } else {
+	$laystyle='book';
+    }
+    return $laystyle;
+}
+
+sub print_page_in_course {
+    my ($helper, $rparmhash, $currentURL, $resources) = @_;
+    my %parmhash       = %$rparmhash;
+    my @page_resources = @$resources;
+    my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
+    my $symb = $helper->{'VARS'}->{'symb'};
+
+
+    my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
+
+
+    my @temporary_array=split /\|/,$format_from_helper;
+    my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
+    $laystyle = &map_laystyle($laystyle);
+    my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,
+								      $numberofcolumns);
+    my $LaTeXwidth=&recalcto_mm($textwidth); 
+
+
+    if ($mode ne '') {$mode='\\'.$mode}
+    my $result.= &print_latex_header($mode);
+    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);
+    } else {
+	$result.=$currentURL;
+    }
+    $result .= '\\\\';
+
+    if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+	&Apache::lonnet::appenv({'construct.style' =>
+				$helper->{'VARS'}->{'style_file'}});
+    } elsif ($env{'construct.style'}) {
+	&Apache::lonnet::delenv('construct.style');
+    }
+
+    # First is the overall page description.  This is then followed by the 
+    # components of the page. Each of which must be printed independently.
+
+    my $the_page = shift(@page_resources); 
+
+    foreach my $resource (@page_resources) {
+	my $resource_src   = $resource->src(); # Essentially the URL of the resource.
+	$result           .= $resource->title() . '\\\\';
+
+	# Recurse if a .page:
+
+	if ($resource_src =~ /.page$/i) {
+	    my $navmap         = Apache::lonnavmaps::navmap->new();
+	    my @page_resources = $navmap->retrieveResources($resource_src);
+	    $result           .= &print_page_in_course($helper, $rparmhash, 
+						       $resource_src, \@page_resources);
+	}
+	# these resources go through the XML transformer:
+
+	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm\xhtml|xhtm)$/)  {		
+	    my $urlp = &Apache::lonnet::clutter($resource_src);
+	    my %form;
+	    my %moreenv;
+
+	    &Apache::lonxml::remember_problem_counter();
+	    $moreenv{'request.filename'}=$urlp;
+	    if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
+
+	    $form{'grade_target'}  = 'tex';
+	    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+	    $form{'pdfFormFiels'} = $pdfFormFields; # 
+	    $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};    
+	    
+	    $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+	    $form{'suppress_tries'}=$parmhash{'suppress_tries'};
+	    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+	    $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+	    $form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+	    if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+		($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+		$form{'problem_split'}='yes';
+	    }
+	    my $rndseed = time;
+	    if ($helper->{'VARS'}->{'curseed'}) {
+		$rndseed=$helper->{'VARS'}->{'curseed'};
+	    }
+	    $form{'rndseed'}=$rndseed;
+	    &Apache::lonnet::appenv(\%moreenv);
+	    
+	    &Apache::lonxml::clear_problem_counter();
+
+	    my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
+
+	    # There seems to be an extraneous \vskip 1mm \\\\ :
+
+	    $texversion =~ s/^\\vskip 1mm \\\\\\\\//;
+
+	    # current document with answers.. no need to encap in minipage
+	    #  since there's only one answer.
+
+	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+		my %answerform = %form;
+
+
+		$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+		$answerform{'grade_target'}='answer';
+		$answerform{'answer_output_mode'}='tex';
+		$answerform{'rndseed'}=$rndseed;
+                if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {
+		    $answerform{'problemtype'}='exam';
+		}
+		$resources_printed .= $urlp.':';
+		my $answer=&ssi_with_retries($urlp,$ssi_retry_count, %answerform);
+
+		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		} else {
+		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+		    if ($helper->{'VARS'}->{'construction'} ne '1') {
+			my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+			$title = &Apache::lonxml::latex_special_symbols($title);
+			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+			$texversion.=&path_to_problem($urlp,$LaTeXwidth);
+		    } else {
+			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
+			my $URLpath=$urlp;
+			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
+			$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
+		    }
+		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
+		}
+
+
+		
+
+	    
+	    }
+	    # Print annotations.
+
+
+	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+		my $annotation .= &annotate($currentURL);
+		$texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+	    }
+	    
+	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+		$texversion=&IndexCreation($texversion,$currentURL);
+	    }
+	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+
+	    }
+	    $result .= $texversion;
+	    if ($currentURL=~m/\.page\s*$/) {
+		($result,$numberofcolumns) = &page_cleanup($result);
+	    }
+	}
+    }
+
+    $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
+    return $result;
+}
+
 
 #
 # List of recently generated print files
@@ -933,20 +1511,43 @@ sub recently_generated {
 	    $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 />';
+        my $ext_text = 'pdf' ? &mt('PDF File'):&mt('Zip File');
+	my $result=&Apache::loncommon::start_data_table_row()
+                  .'<td>'
+                  .'<a href="/prtspool/'.$filename.'">'.$ext_text.'</a>'
+                  .'</td>'
+                  .'<td>'.&Apache::lonlocal::locallocaltime($cctime).'</td>'
+                  .'<td align="right">'.$csize.'</td>'
+                  .&Apache::loncommon::end_data_table_row();
 	if ($ext eq 'pdf') { $pdf_result .= $result; }
 	if ($ext eq 'zip') { $zip_result .= $result; }
     }
+    if ($zip_result || $pdf_result) {
+        $r->print('<hr />');
+    }
     if ($zip_result) {
-	$r->print('<h4>'.&mt('Recently generated printout zip files')."</h4>\n"
-		  .$zip_result);
+	$r->print('<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
+                  .&Apache::loncommon::start_data_table()
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.&mt('Download').'</th>'
+                  .'<th>'.&mt('Creation Date').'</th>'
+                  .'<th>'.&mt('File Size (Bytes)').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row()
+                  .$zip_result
+                  .&Apache::loncommon::end_data_table()
+        );
     }
     if ($pdf_result) {
-	$r->print('<h4>'.&mt('Recently generated printouts')."</h4>\n"
-		  .$pdf_result);
+	$r->print('<h3>'.&mt('Recently generated printouts')."</h3>\n"
+                  .&Apache::loncommon::start_data_table()
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.&mt('Download').'</th>'
+                  .'<th>'.&mt('Creation Date').'</th>'
+                  .'<th>'.&mt('File Size (Bytes)').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row()
+                  .$pdf_result
+                  .&Apache::loncommon::end_data_table()
+        );
     }
 }
 
@@ -959,28 +1560,148 @@ sub recently_generated {
 #    A reference to a page break hash.
 #
 #
+#use Data::Dumper;
+#sub dump_helper_vars {
+#    my ($helper) = @_;
+#    my $helpervars = Dumper($helper->{'VARS'});
+#    &Apache::lonnet::logthis("Dump of helper vars:\n $helpervars");
+#}
 
 sub get_page_breaks  {
     my ($helper) = @_;
     my %page_breaks;
-    
+
     foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
 	$page_breaks{$break} = 1;
     }
-    
     return %page_breaks;
 }
 
+#  Output a sequence (recursively if neeed)
+#  from construction space.
+# Parameters:
+#    url     = URL of the sequence to print.
+#    helper  - Reference to the helper hash.
+#    form    - Copy of the format hash.
+#    LaTeXWidth
+# Returns:
+#   Text to add to the printout.
+#   NOTE if the first element of the outermost sequence
+#   is itself a sequence, the outermost caller may need to
+#   prefix the latex with the page headers stuff.
+#
+sub print_construction_sequence {
+    my ($currentURL, $helper, %form, $LaTeXwidth) = @_;
+    my $result;
+    my $rndseed=time;
+    if ($helper->{'VARS'}->{'curseed'}) {
+	$rndseed=$helper->{'VARS'}->{'curseed'};
+    }
+    my $errtext=&LONCAPA::map::mapread($currentURL);
+    # 
+    #  These make this all support recursing for subsequences.
+    #
+    my @order    = @LONCAPA::map::order;
+    my @resources = @LONCAPA::map::resources; 
+    for (my $member=0;$member<=$#order;$member++) {
+	$resources[$order[$member]]=~/^([^:]*):([^:]*):/;
+	my $urlp=$2;
+	if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
+	    my $texversion='';
+	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
+		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
+		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
+		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+		$form{'rndseed'}=$rndseed;
+		$resources_printed .=$urlp.':';
+		$texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
+	    }
+	    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+		($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
+	       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
+		#  Don't permanently modify %$form...
+		my %answerform = %form;
+		$answerform{'grade_target'}='answer';
+		$answerform{'answer_output_mode'}='tex';
+		$answerform{'rndseed'}=$rndseed;
+		$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+		if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
+		$resources_printed .= $urlp.':';
+		my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
+		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+		} else {
+		    # If necessary, encapsulate answer in minipage:
+		    
+		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+		    my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+		    $title = &Apache::lonxml::latex_special_symbols($title);
+		    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+		    $body.=&path_to_problem($urlp,$LaTeXwidth);
+		    $body.='\vskip 1 mm '.$answer.'\end{document}';
+		    $body = &encapsulate_minipage($body);
+		    $texversion.=$body;
+		}
+	    }
+	    $texversion = &latex_header_footer_remove($texversion);
+
+	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+		$texversion=&IndexCreation($texversion,$urlp);
+	    }
+	    if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+		$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
+	    }
+	    $result.=$texversion;
+
+	} elsif ($urlp=~/\.(sequence|page)$/) {
+ 
+	    # header:
+
+	    $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
+
+	    # IF sequence, recurse:
+	    
+	    if ($urlp =~ /\.sequence$/) {
+		my $sequence_url = $urlp;
+		my $domain       = $env{'user.domain'};	# Constr. space only on local
+		my $user         = $env{'user.name'};
+
+		$sequence_url    =~ s/^\/res\/$domain/\/home/;
+		$sequence_url    =~ s/^(\/home\/$user)/$1\/public_html/;
+#		$sequence_url    =~ s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
+		$result .= &print_construction_sequence($sequence_url, 
+							$helper, %form, 
+							$LaTeXwidth);
+	    }
+	}
+	elsif ($urlp =~ /\.pdf$/i) {
+	    my $texversion;
+	    if ($member != 0) {
+		$texversion .= '\cleardoublepage';
+	    }
+
+	    $texversion .= &include_pdf($urlp);
+	    $texversion = &latex_header_footer_remove($texversion);
+	    if ($member != $#order) {
+		$texversion .= '\\ \cleardoublepage';
+	    }
+	    
+	    $result .= $texversion;
+	}
+    }
+    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
+    return $result;
+}
+
 sub output_data {
     my ($r,$helper,$rparmhash) = @_;
     my %parmhash = %$rparmhash;
-    my $resources_printed = '';
-    my $html=&Apache::lonxml::xmlbegin();
-    my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
-    $r->print(<<ENDPART);
-$html
-<head>
-<script type="text/javascript" language="Javascript">
+    $ssi_error = 0;		# This will be set nonzero by failing ssi's.
+    $resources_printed = '';
+    $font_size = $helper->{'VARS'}->{'fontsize'};
+    my $do_postprocessing = 1;
+    my $js = <<ENDPART;
+<script type="text/javascript">
     var editbrowser;
     function openbrowser(formname,elementname,only,omit) {
         var url = '/res/?';
@@ -1004,15 +1725,22 @@ $html
         editbrowser.focus();
     }
 </script>
-<title>LON-CAPA output for printing</title>
-</head>
-$bodytag
-<p>
-Please stand by while processing your print request, this may take some time ...
-</p>
 ENDPART
 
 
+    # Breadcrumbs
+    #FIXME: Choose better/different breadcrumbs?!? Links?
+    my $brcrum = [{'href' => '',
+                   'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
+                  {'href' => '',
+                   'text' => 'Preparing Printout'}];
+
+    my $start_page  = &Apache::loncommon::start_page('Preparing Printout',
+                                                     $js,
+                                                     {'bread_crumbs' => $brcrum,});
+    my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
+
+    $r->print($start_page."\n<p>\n$msg\n</p>\n");
 
     # fetch the pagebreaks and store them in the course environment
     # The page breaks will be pulled into the hash %page_breaks which is
@@ -1030,18 +1758,16 @@ ENDPART
     my ($result,$selectionmade) = ('','');
     my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my @temporary_array=split /\|/,$format_from_helper;
-    my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
-    if ($laystyle eq 'L') {
-	$laystyle='album';
-    } else {
-	$laystyle='book';
-    }
+    my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
+
+    $laystyle = &map_laystyle($laystyle);
     my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
     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
@@ -1050,6 +1776,7 @@ ENDPART
     my %form;
     $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
+    $form{'pdfFormFields'} = $pdfFormFields;
 
     # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the 
@@ -1061,6 +1788,14 @@ ENDPART
     if ($helper->{'VARS'}->{'showallfoils'} eq "1") { 
 	$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
     }
+    
+    if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+	&Apache::lonnet::appenv({'construct.style' =>
+				$helper->{'VARS'}->{'style_file'}});
+    } elsif ($env{'construct.style'}) {
+	&Apache::lonnet::delenv('construct.style');
+    }
+
 
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
@@ -1071,43 +1806,50 @@ ENDPART
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
 	    $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
 	} else {
+
             #prints resource from the construction space
 	    $currentURL='/'.$helper->{'VARS'}->{'filename'};
 	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
-	if ($cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	if ($cleanURL!~m|^/adm/|
+	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
 	    my $texversion='';
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
 		my %moreenv;
 		$moreenv{'request.filename'}=$cleanURL;
-		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
-		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
-		    my $dom = $env{'user.domain'};
-		    my $user = $env{'user.name'};
-		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
-		}
                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
-		if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
+		$form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+		if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+		    ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+		    $form{'problem_split'}='yes';
+		}
 		if ($helper->{'VARS'}->{'curseed'}) {
 		    $rndseed=$helper->{'VARS'}->{'curseed'};
 		}
 		$form{'rndseed'}=$rndseed;
-		&Apache::lonnet::appenv(%moreenv);
-		&Apache::lonnet::delenv('form.counter');
-		&Apache::lonxml::init_counter();
-		&Apache::lonxml::store_counter();
+		&Apache::lonnet::appenv(\%moreenv);
+
+		&Apache::lonxml::clear_problem_counter();
+
 		$resources_printed .= $currentURL.':';
-		$texversion.=&Apache::lonnet::ssi($currentURL,%form);
-		&Apache::lonnet::delenv('form.counter');
+		$texversion.=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
+
+		#  Add annotations if required:
+	    
+		&Apache::lonxml::clear_problem_counter();
+
 		&Apache::lonnet::delenv('request.filename');
 	    }
+	    # current document with answers.. no need to encap in minipage
+	    #  since there's only one answer.
+
 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
@@ -1118,23 +1860,41 @@ ENDPART
 		    $form{'problemtype'}='exam';
 		}
 		$resources_printed .= $currentURL.':';
-		my $answer=&Apache::lonnet::ssi($currentURL,%form);
+		my $answer=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
+		
+
 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 		    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 		} else {
 		    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
 		    if ($helper->{'VARS'}->{'construction'} ne '1') {
-			$texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+			my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+			$title = &Apache::lonxml::latex_special_symbols($title);
+			$texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
 			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
 			my $URLpath=$cleanURL;
 			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
-			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+			$texversion.=&path_to_problem($URLpath,$LaTeXwidth);
 		    }
 		    $texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		}
+
+
+		
+
+	    
+	    }
+	    # Print annotations.
+
+
+	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+		my $annotation .= &annotate($currentURL);
+		$texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
 	    }
+
+
 	    if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
 		$texversion=&IndexCreation($texversion,$currentURL);
 	    }
@@ -1146,88 +1906,76 @@ 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|page)$/ && $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;
-			$resources_printed .=$urlp.':';
-			$texversion=&Apache::lonnet::ssi($urlp,%form);
-		    }
-		    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
-		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
-		       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
-			#  Don't permanently modify %$form...
-			my %answerform = %form;
-			$answerform{'grade_target'}='answer';
-			$answerform{'answer_output_mode'}='tex';
-			$answerform{'rndseed'}=$rndseed;
-			$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
-                        if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
-			$resources_printed .= $urlp.':';
-			my $answer=&Apache::lonnet::ssi($urlp,%answerform);
-			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-			    $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
-			} else {
-			    $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($urlp,$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);
+		my $texversion=&ssi_with_retries($currentURL, $ssi_retry_count, %form);
+		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+		    my $annotation = &annotate($currentURL);
+		    $texversion    =~ s/(\\end{document})/$annotation$1/;
+		}
 		$result .= $texversion;
+	} elsif ($cleanURL =~/\.tex$/) {
+	    # For this sort of print of a single LaTeX file,
+	    # We can just print the LaTeX file as it is uninterpreted in any way:
+	    #
+
+	    $result = &fetch_raw_resource($currentURL);
+	    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+		my $annotation = &annotate($currentURL);
+		$result =~ s/(\\end{document})/$annotation$1/;
+	    }
+
+	    $do_postprocessing = 0; # Don't massage the result.
+
+	} elsif ($cleanURL =~ /\.pdf$/i) {
+	    $result .= &include_pdf($cleanURL);
+	    $result .= '\end{document}';
+	} elsif ($cleanURL =~ /\.page$/i) { #  Print page in non construction space contexts.
+
+	    # Determine the set of resources in the map of the page:
+
+	    my $navmap         =  Apache::lonnavmaps::navmap->new();
+	    my @page_resources =  $navmap->retrieveResources($cleanURL);
+	    $result           .=  &print_page_in_course($helper, $rparmhash,
+							$cleanURL, \@page_resources);
+
+       
 	} else {
-	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'});
+	    &Apache::lonnet::logthis("Unsupported type handler");
+	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
+				  $helper->{'VARS'}->{'symb'});
 	}
     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
-	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
+	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
+	     ) { 
+
+
         #-- produce an output string
 	if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
 	    $selectionmade = 2;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
 	    $selectionmade = 3;
-	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
+	} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') 
+		 ) {
 	    $selectionmade = 4;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
 	    $selectionmade = 4;
@@ -1238,16 +1986,24 @@ ENDPART
 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 	$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
-	if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
+	$form{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+	if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')   ||
+	    ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') ) {
+	    $form{'problem_split'}='yes';
+	}
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 	my $prevassignment='';
-	&Apache::lonnet::delenv('form.counter');
-	&Apache::lonxml::init_counter();
-	&Apache::lonxml::store_counter();
+
+	&Apache::lonxml::clear_problem_counter();
+
+	my $pbreakresources = keys %page_breaks;
 	for (my $i=0;$i<=$#master_seq;$i++) {
 
+	    &Apache::lonenc::reset_enc();
+
+
 	    # Note due to document structure, not allowed to put \newpage
 	    # prior to the first resource
 
@@ -1256,28 +2012,29 @@ ENDPART
 		    $result.="\\newpage\n";
 		}
 	    }
-	    my ($sequence,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+	    my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    $urlp=&Apache::lonnet::clutter($urlp);
 	    $form{'symb'}=$master_seq[$i];
 
+
 	    my $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.':';
-		my $pre_counter=$env{'form.counter'};
-		$texversion.=&Apache::lonnet::ssi($urlp,%form);
+		&Apache::lonxml::remember_problem_counter();
+		$texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($urlp=~/\.page$/) {
+
 		    ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
 		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
 		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
 		    $flag_page_in_sequence = 'YES';
 		} 
-		my ($envfile) = ($env{'user.environment'} =~m|/([^/]+)\.id$| );
-		&Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
-							 $envfile);
-		my $current_counter=$env{'form.counter'};
+
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 		    #  Don't permanently pervert the %form hash
@@ -1285,22 +2042,34 @@ ENDPART
 		    $answerform{'grade_target'}='answer';
 		    $answerform{'answer_output_mode'}='tex';
 		    $resources_printed .= $urlp.':';
-		    &Apache::lonnet::appenv(('form.counter' => $pre_counter));
-		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
-		    &Apache::lonnet::appenv(('form.counter' => $current_counter));
+
+		    &Apache::lonxml::restore_problem_counter();
+		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
+
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 		    } else {
 			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($master_seq[$i]).'}\vskip 0 mm ';
-			    $texversion.=&path_to_problem ($urlp,$LaTeXwidth);
-			    $texversion.='\vskip 1 mm '.$answer;
+			    $texversion =~ s/\\begin{document}//;
+			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
+			    $title = &Apache::lonxml::latex_special_symbols($title);
+			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+			    $body   .= &path_to_problem ($urlp,$LaTeXwidth);
+			    $body   .='\vskip 1 mm '.$answer;
+			    $body    = &encapsulate_minipage($body);
+			    $texversion .= $body;
 			} else {
 			    $texversion='';
 			}
 		    }
+
 		}
+		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+		    my $annotation .= &annotate($urlp);
+		    $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+		}
+
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
 		} else {
@@ -1312,9 +2081,18 @@ ENDPART
 		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
 		    my $name = &get_name();
 		    my $courseidinfo = &get_course();
-		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		    $prevassignment=$assignment;
-		    $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
+		    my $header_text = $parmhash{'print_header_format'};
+		    $header_text    = &format_page_header($textwidth, $header_text,
+							  $assignment, 
+							  $courseidinfo, 
+							  $name);
+
+		    if ($numberofcolumns eq '1') {
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
+		    } else {
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$header_text.'}} \vskip 5 mm ';
+		    }			
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
@@ -1322,16 +2100,39 @@ ENDPART
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		$resources_printed .= $urlp.':';
-		my $texversion=&Apache::lonnet::ssi($urlp,%form);
+		my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
+		if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+		    my $annotation = &annotate($urlp);
+		    $texversion =~ s/(\\end{document)/$annotation$1/;
+		}
+
 		if ($flag_latex_header_remove ne 'NO') {
 		    $texversion = &latex_header_footer_remove($texversion);
-		} else {
+		} else {	
 		    $texversion =~ s/\\end{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES'; 
+	    } elsif ($urlp=~ /\.pdf$/i) {
+		if ($i > 0) {
+		    $result .= '\cleardoublepage';
+		}
+		$result .= &include_pdf($urlp);
+		if ($i != $#master_seq) {
+		    if ($numberofcolumns eq '1') {
+			$result .= '\newpage';
+		    } else {
+			# the \\'s seem to be needed to let LaTeX know there's something
+			# on the page since LaTeX seems to not like to clear an empty page.
+			#
+			$result .= '\\ \cleardoublepage';
+		    }
+		}
+		$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 {
@@ -1340,20 +2141,24 @@ ENDPART
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
 	    }	    
-	    if (&Apache::loncommon::connection_aborted($r)) { last; }
+	    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 'all_problems_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') {
+	 if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {
 	     $selectionmade=5;
 	     $type='problems';
 	 } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
@@ -1367,27 +2172,47 @@ 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 $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{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
 	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
 	 $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
-	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
+	 if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')  ||
+	     ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+	     $moreenv{'problem_split'}='yes';
+	 }
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
 	 my $student_counter=-1;
+	 my $i = 0;
+	 my $last_section = (split(/:/,$students[0]))[2];
 	 foreach my $person (@students) {
 
              my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
@@ -1396,13 +2221,20 @@ ENDPART
 		 print $temp_file "1969\n";
 	     }
 	     $student_counter++;
-	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
+	     if ($split_on_sections) {
+		 my $this_section = (split(/:/,$person))[2];
+		 if ($this_section ne $last_section) {
+		     $i++;
+		     $last_section = $this_section;
+		 }
+	     } else {
+		 $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
+	     }
 	     my ($output,$fullname, $printed)=&print_resources($r,$helper,
 						     $person,$type,
 						     \%moreenv,\@master_seq,
 						     $flag_latex_header_remove,
-						     $LaTeXwidth,
-						     $number_of_columns);
+						     $LaTeXwidth);
 	     $resources_printed .= ":";
 	     $print_array[$i].=$output;
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
@@ -1423,9 +2255,9 @@ ENDPART
 	 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 @lines = &Apache::grades::get_scantronformat_file();
 	 my ($code_type,$code_length)=('letter',6);
-	 foreach my $line (<FH>) {
+	 foreach my $line (@lines) {
 	     my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
 	     if ($name eq $code_option) {
 		 $code_length=$length;
@@ -1434,6 +2266,7 @@ ENDPART
 	 }
 	 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) {
@@ -1475,6 +2308,7 @@ ENDPART
 	 }
 	 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;
@@ -1514,6 +2348,9 @@ ENDPART
 	    $rndseed=$helper->{'VARS'}->{'curseed'};
 	}
 	for (my $i=0;$i<=$#list_of_files;$i++) {
+
+	    &Apache::lonenc::reset_enc();
+
 	    my $urlp = $list_of_files[$i];
 	    $urlp=~s|//|/|;
 	    if ($urlp=~/\//) {
@@ -1525,7 +2362,7 @@ ENDPART
 		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
 		}
 		$resources_printed .= $urlp.':';
-		my $texversion=&Apache::lonnet::ssi($urlp,%form);
+		my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 		    #  Don't permanently pervert %form:
@@ -1535,7 +2372,7 @@ ENDPART
 		    $answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		    $answerform{'rndseed'}=$rndseed;
 		    $resources_printed .= $urlp.':';
-		    my $answer=&Apache::lonnet::ssi($urlp,%answerform);
+		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
 			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 		    } else {
@@ -1552,7 +2389,8 @@ ENDPART
 			$texversion.='\vskip 1 mm '.$answer.'\end{document}';
 		    }
 		}
-                #this chunck is responsible for printing the path to problem
+                #this chunk is responsible for printing the path to problem
+
 		my $newurlp=$urlp;
 		if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
 		$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
@@ -1577,114 +2415,139 @@ ENDPART
 	$result .= '\end{document}';      	
     }
 #-------------------------------------------------------- corrections for the different page formats
-    $result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
-    $result = &latex_corrections($number_of_columns,$result,$selectionmade,
-				 $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'});
-    }
-    #changes page's parameters for the one column output 
-    if ($numberofcolumns == 1) {
+
+    # Only post process if that has not been turned off e.g. by a raw latex resource.
+
+    if ($do_postprocessing) {
+	$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
+	$result = &latex_corrections($number_of_columns,$result,$selectionmade,
+				     $helper->{'VARS'}->{'ANSWER_TYPE'});
+	#if ($numberofcolumns == 1) {
 	$result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
-	$result =~ s/\\textheight\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+	$result =~ s/\\textheight\s*=?\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
 	$result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
 	$result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+	#}
+    }
+
+    # Set URLback if this is a construction space print so we can provide
+    # a link to the resource being edited.
+    #
+
+    my $URLback=''; #link to original document
+    if ($helper->{'VARS'}->{'construction'} eq '1') {
+	#prints resource from the construction space
+	$URLback='/'.$helper->{'VARS'}->{'filename'};
+	if ($URLback=~/([^?]+)/) {
+	    $URLback=$1;
+	    $URLback=~s|^/~|/priv/|;
+	}
     }
+    #
+    # Final adjustment of the font size:
+    #
+
+    $result = set_font_size($result);
 
 #-- 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";
     if (!($#print_array>0)) { 
-	unless ($temp_file = Apache::File->new('>'.$filename)) {
-	    $r->log_error("Couldn't open $filename for output $!");
-	    return SERVER_ERROR; 
-	}
-	print $temp_file $result;
-	my $begin=index($result,'\begin{document}',0);
-	my $inc=substr($result,0,$begin+16);
+       unless ($temp_file = Apache::File->new('>'.$filename)) {
+	  $r->log_error("Couldn't open $filename for output $!");
+	  return SERVER_ERROR; 
+       }
+       print $temp_file $result;
+       my $begin=index($result,'\begin{document}',0);
+       my $inc=substr($result,0,$begin+16); 
     } else {
-	my $begin=index($result,'\begin{document}',0);
-	my $inc=substr($result,0,$begin+16);
-        for (my $i=0;$i<=$#print_array;$i++) {
-	    if ($i==0) {
-		$print_array[$i]=$result;
-	    } else {
-		my $anobegin=index($print_array[$i],'\setcounter{page}',0);
-		substr($print_array[$i],0,$anobegin)='';
-		$print_array[$i]=$inc.$print_array[$i].'\end{document}';
-	    }
-	    my $temp_file;
-	    my $newfilename=$filename;
-	    my $num=$i+1;
-	    $newfilename =~s/\.tex$//; 
-	    $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
-	    unless ($temp_file = Apache::File->new('>'.$newfilename)) {
-		$r->log_error("Couldn't open $newfilename for output $!");
-		return SERVER_ERROR; 
-	    }
-	    print $temp_file $print_array[$i];
-	}
+       my $begin=index($result,'\begin{document}',0);
+       my $inc=substr($result,0,$begin+16);
+       for (my $i=0;$i<=$#print_array;$i++) {
+	  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];
+	  }
+	  my $temp_file;
+	  my $newfilename=$filename;
+	  my $num=$i+1;
+	  $newfilename =~s/\.tex$//; 
+	  $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
+	  unless ($temp_file = Apache::File->new('>'.$newfilename)) {
+	      $r->log_error("Couldn't open $newfilename for output $!");
+	      return SERVER_ERROR; 
+	  }
+	  print $temp_file $print_array[$i];
+       }
     }
     my $student_names='';
     if ($#print_array>0) {
-	for (my $i=0;$i<=$#print_array;$i++) {
-	    $student_names.=$student_names[$i].'_ENDPERSON_';
+        for (my $i=0;$i<=$#print_array;$i++) {
+  	  $student_names.=$student_names[$i].'_ENDPERSON_';
 	}
     } else {
 	if ($#student_names>-1) {
-	    $student_names=$student_names[0].'_ENDPERSON_';
+	   $student_names=$student_names[0].'_ENDPERSON_';
 	} else {
-	    my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
-	    $student_names=join(':',$env{'user.name'},$env{'user.domain'},
-				$env{'request.course.sec'},$fullname).
-				    '_ENDPERSON_'.'_END_';
+           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_';
 	}
-    }
-
-    my $URLback=''; #link to original document
-    if ($helper->{'VARS'}->{'construction'} ne '1') {
-	#prints published resource
-	$URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
+     }
+	
+     # 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' => $perm{'pav'},
+				'cgi.'.$identifier.'.numberoffiles' => $#print_array,
+				'cgi.'.$identifier.'.studentnames' => $student_names,
+				'cgi.'.$identifier.'.backref' => $URLback,});
+    &Apache::lonnet::appenv({"cgi.$identifier.user"    => $env{'user.name'},
+				"cgi.$identifier.domain"  => $env{'user.domain'},
+				"cgi.$identifier.courseid" => $cnum, 
+				"cgi.$identifier.coursedom" => $cdom, 
+				"cgi.$identifier.resources" => $resources_printed});
+	
+    my $end_page = &Apache::loncommon::end_page();
+    my $continue_text = &mt('Continue');
+    # If there's been an unrecoverable SSI error, report it to the user
+    if ($ssi_error) {
+        my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
+        $r->print('<br /><p class="LC_error">'.&mt('An unrecoverable network error occurred:').'</p><p>'.
+                  &mt('At least one of the resources you chose to print could not be rendered due to an unrecoverable error when communicating with a server:').
+                  '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
+                  '</p><p>'.&mt('You can continue using the link provided below, but make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
+                  &mt('You may be able to reprint the individual resources for which this error occurred, as the issue may be temporary.').
+                  '<br />'.&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).'</p><p>'.
+                  &mt('We apologize for the inconvenience.').'</p>'.
+                  '<a href="/cgi-bin/printout.pl?'.$identifier.'">'.$continue_text.'</a>'.$end_page);
     } else {
-	#prints resource from the construction space
-	$URLback='/'.$helper->{'VARS'}->{'filename'};
-	if ($URLback=~/([^?]+)/) {
-	    $URLback=$1;
-	    $URLback=~s|^/~|/priv/|;
-	}
-    }
-    # logic for now is too complex to trace if this has been defined
-    #  yet.
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,
-                            'cgi.'.$identifier.'.layout'  => $laystyle,
-                            'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
-			    'cgi.'.$identifier.'.paper'  => $papersize,
-                            'cgi.'.$identifier.'.selection' => $selectionmade,
-			    'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
-			    'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
-			    'cgi.'.$identifier.'.role' => $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);
-
-$r->print(<<FINALEND);
+	$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>
+<a href="/cgi-bin/printout.pl?$identifier">$continue_text</a>
+$end_page
 FINALEND
+    }                                     # endif ssi errors.
 }
 
 
@@ -1707,23 +2570,37 @@ sub get_CODE {
 
 sub print_resources {
     my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
-	$LaTeXwidth,$number_of_columns)=@_;
+	$LaTeXwidth)=@_;
     my $current_output = ''; 
     my $printed = '';
     my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);
-    my $namepostfix;
+    my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
     if ($person =~ 'anon') {
-	$namepostfix="\\\\Name: ";
+	$namepostfix .="Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+    #  Fullname may have special latex characters that need \ prefixing:
+    #
+
     my $i           = 0;
     #goes through all resources, checks if they are available for 
     #current student, and produces output   
-    &Apache::lonnet::delenv('form.counter');
-    &Apache::lonxml::init_counter();
-    &Apache::lonxml::store_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}) {
@@ -1732,37 +2609,51 @@ sub print_resources {
 	    }
 	}
 	$i++;
+
 	if ( !($type eq 'problems' && 
 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
-		if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+		if ($res_url!~m|^ext/|
+		    && $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 		    $printed .= $curresline.':';
-		    my $pre_counter=$env{'form.counter'};
-		    my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
-		    my ($envfile) =
-			( $env{'user.environment'} =~ m|/([^/]+)\.id$| );
-		    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
-							     $envfile);
-		    my $current_counter=$env{'form.counter'};
+		    &Apache::lonxml::remember_problem_counter();    
+
+		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+
 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 			#   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::lonnet::appenv(('form.counter' => $pre_counter));
+			
+			&Apache::lonxml::restore_problem_counter();
+
 			my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%answerenv);
-			&Apache::lonnet::appenv(('form.counter' => $current_counter));
+
 			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($res_url,$LaTeXwidth);
-			    $rendered.='\vskip 1 mm '.$ansrendered;
+
+			    
+			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+			    $header =~ s/\\begin{document}//;     #<<<<<
+			    my $title = &Apache::lonnet::gettitle($curresline);
+			    $title = &Apache::lonxml::latex_special_symbols($title);
+			    my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+			    $body     .=&path_to_problem($res_url,$LaTeXwidth);
+			    $body     .='\vskip 1 mm '.$ansrendered;
+			    $body     = &encapsulate_minipage($body);
+			    $rendered = $header.$body;
 			}
 		    }
+
+		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+			my $url = &Apache::lonnet::clutter($res_url);
+			my $annotation = &annotate($url);
+			$rendered =~  s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+		    }
 		    if ($remove_latex_header eq 'YES') {
 			$rendered = &latex_header_footer_remove($rendered);
 		    } else {
@@ -1771,20 +2662,27 @@ 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 ($envfile) = 
-			( $env{'user.environment'} =~ m|/([^/]+)\.id$| );
-		    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
-							     $envfile);
-		    my $current_counter=$env{'form.counter'};
+		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+		    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+			my $url = &Apache::lonnet::clutter($res_url);
+			my $annotation = &annotate($url);
+			$annotation    =~ s/(\\end{document})/$annotation$1/;
+		    }
 		    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 ';
+		    $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
+		} elsif($res_url = ~/\.pdf$/) {
+		    my $url = &Apache::lonnet::clutter($res_url);
+		    my $rendered  = &include_pdf($url);
+		    if ($remove_latex_header ne 'NO') {
+			$rendered = &latex_header_footer_remove($rendered);
+		    }
+		    $current_output .= $rendered;
 		} 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 {
@@ -1794,20 +2692,33 @@ sub print_resources {
 		}
 	    }
 	    $remove_latex_header = 'YES';
-	}
+	} 
 	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
+
+
     my $courseidinfo = &get_course();
-    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-    if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
+    my $header_line =
+	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+			    $currentassignment, $courseidinfo, $fullname, $usersection);
+    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;
     }
+    #
+    #  Close the student bracketing.
+    #
     return ($current_output,$fullname, $printed);
 
 }
@@ -1818,34 +2729,17 @@ sub handler {
     
     &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 $helper = printHelper($r);
     if (!ref($helper)) {
 	return $helper;
     }
    
-#	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
@@ -1856,6 +2750,8 @@ sub handler {
     if(-e $conversion_queuefile) {
 	unlink $conversion_queuefile;
     }
+    
+
     &output_data($r,$helper,\%parmhash);
     return OK;
 } 
@@ -1869,7 +2765,7 @@ sub addMessage {
     Apache::lonhelper::message->new();
 }
 
-use Data::Dumper;
+
 
 sub init_perm {
     undef(%perm);
@@ -1878,13 +2774,40 @@ sub init_perm {
 	$perm{'pav'}=&Apache::lonnet::allowed('pav',
 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     }
-    $perm{'pfo'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});
+    $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
     if (!$perm{'pfo'}) {
 	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
 		  $env{'request.course.id'}.'/'.$env{'request.course.sec'});
     }
 }
 
+sub get_randomly_ordered_warning {
+    my ($helper,$map) = @_;
+
+    my $message;
+
+    my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (defined($navmap)) {
+        my $res = $navmap->getResourceByUrl($map);
+        if ($res) {
+	    my $func = 
+	        sub { return ($_[0]->is_map() && $_[0]->randomorder); };
+	    my @matches = $navmap->retrieveResources($res, $func,1,1,1);
+	    if (@matches) {
+	        $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
+	    }
+        }
+        if ($message) {
+	    return '<message type="warning">'.$message.'</message>';
+        }
+    } else {
+        $message = "Retrieval of information about ordering of resources failed."; 
+        return '<message type="warning">'.$message.'</message>';
+    }
+    return;
+}
+
 sub printHelper {
     my $r = shift;
 
@@ -1926,17 +2849,24 @@ sub printHelper {
     $helper->declareVar('FINISHPAGE');
     $helper->declareVar('PRINT_TYPE');
     $helper->declareVar("showallfoils");
+    $helper->declareVar("STUDENTS");
+
+
+   
+
 
     #  The page breaks can get loaded initially from the course environment:
     # But we only do this in the initial state so that they are allowed to change.
     #
 
-    $helper->{VARS}->{FINISHPAGE} = '';
+    # $helper->{VARS}->{FINISHPAGE} = '';
     
     &Apache::loncommon::restore_course_settings('print',
 						{'pagebreaks'  => 'scalar',
 					         'lastprinttype' => 'scalar'});
     
+    # This will persistently load in the data we want from the
+    # very first screen.
     
     if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {
 	if (!defined ($env{"form.CURRENT_STATE"})) {
@@ -1950,10 +2880,7 @@ sub printHelper {
 	}
 	
     }
-    
-    
-    # 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:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "~$1/$2";
@@ -1961,6 +2888,9 @@ sub printHelper {
     } else {
         if ($env{'form.postdata'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
+	    if ( $helper->{VARS}->{'symb'} eq '') {
+		$helper->{VARS}->{'postdata'} = $env{'form.postdata'};
+	    }
         }
         if ($env{'form.symb'}) {
             $helper->{VARS}->{'symb'} = $env{'form.symb'};
@@ -1968,6 +2898,7 @@ sub printHelper {
         if ($env{'form.url'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
         }
+
     }
 
     if ($env{'form.symb'}) {
@@ -1987,6 +2918,7 @@ sub printHelper {
     my $symb = $helper->{VARS}->{'symb'};
     my ($map, $id, $url);
     my $subdir;
+    my $is_published=0;		# True when printing from resource space.
 
     # Get the resource name from construction space
     if ($helper->{VARS}->{'construction'}) {
@@ -1995,9 +2927,15 @@ sub printHelper {
         $subdir = substr($helper->{VARS}->{'filename'},
                          0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
     } else {
-        ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
-        $helper->{VARS}->{'postdata'} = 
-	    &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+	if ($symb ne '') {
+	    ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
+	    $helper->{VARS}->{'postdata'} = 
+		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+	} else {
+	    $url = $helper->{VARS}->{'postdata'};
+	    $is_published=1;	# From resource space.
+	}
+	$url = &Apache::lonnet::clutter($url);
 
         if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
             my $postdata = $helper->{VARS}->{'postdata'};
@@ -2009,7 +2947,7 @@ sub printHelper {
 	$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
     }
     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
-	$helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
+	$helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
     }
 
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
@@ -2018,11 +2956,6 @@ sub printHelper {
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
-    if (not $helper->{VARS}->{'construction'}) {
-	$subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;
-    }
-    # "Remove all duplicate slashes."
-    $subdir =~ s|/+|/|g;
 
     # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.
@@ -2039,13 +2972,13 @@ 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
-    my $isProblem = '($res->is_problem()||$res->contains_problem) ';
+    my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
-    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
+    my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
     my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
@@ -2054,42 +2987,43 @@ sub printHelper {
 
     $helper->declareVar('SEQUENCE');
 
-    # Useful for debugging: Dump the help vars
-#     $r->print(Dumper($helper->{VARS}));
-#    $r->print($map);
-
     # If we're in a sequence...
-    if (($helper->{'VARS'}->{'construction'} ne '1') &&
 
+    my $start_new_option;
+    if ($perm{'pav'}) {
+	$start_new_option = 
+	    "<option text='".&mt('Start new page<br />before selected').
+	    "' variable='FINISHPAGE' />";
+    }
+
+    if (($helper->{'VARS'}->{'construction'} ne '1' ) &&
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
-        push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+        push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), '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 [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), '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
@@ -2097,50 +3031,88 @@ HELPERFRAGMENT
 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
     }
 
-    # 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'} && 
+    # If the user has pfo (print for others) allow them to print all 
+    # problems and resources  in the entire course, optionally for selected students
+    if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
 
-        push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
-	push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
+        push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
+	push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
+	push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
          &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>
+  <state name="ALL_PROBLEMS_STUDENTS" title="Select Problem(s) to print">
+    <resource variable="RESOURCES" toponly='0' multichoice="1"
+	suppressEmptySequences='0' addstatus="1" closeallpages="1">
+      <nextstate>STUDENTS1</nextstate>
+      <filterfunc>return $isProblemOrMap;</filterfunc>
+      <choicefunc>return $isNotMap;</choicefunc>
+      <valuefunc>return $symbFilter;</valuefunc>
+      $start_new_option
     </resource>
   </state>
+  <state name="STUDENTS1" title="Select People">
+      <message><b>Select sorting order of printout</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>
+      <message><br /><hr /><br /> </message>
+      <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
+  </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 [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_students', 'CHOOSE_STUDENTS'];
+	    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_anon', 'CHOOSE_ANON1'];
 	}
+
+	my $randomly_ordered_warning = 
+	    &get_randomly_ordered_warning($helper,$map);
+
+	# resource_selector will hold a few states that:
+	#   - Allow resources to be selected for printing.
+	#   - Determine pagination between assignments.
+	#   - Determine how many assignments should be bundled into a single PDF.
+        # TODO:
+	#    Probably good to do things like separate this up into several vars, each
+	#    with one state, and use REGEXPs at inclusion time to set state names
+	#    and next states for better mix and match capability
+	#
 	my $resource_selector=<<RESOURCE_SELECTOR;
+    <state name="SELECT_PROBLEMS" title="Select resources to print">
+    $randomly_ordered_warning
+
+   <nextstate>PRINT_FORMATTING</nextstate> 
    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1" 
               closeallpages="1">
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
-      <option text='New Page' variable='FINISHPAGE' />
+      $start_new_option
       </resource>
+    </state>
+    <state name="PRINT_FORMATTING" title="How should results be printed?">
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
       <choice computer='0'>Start each student\'s assignment on a new page/column (add a pagefeed after each assignment)</choice>
@@ -2148,20 +3120,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>
+      <message><b>Select sorting order of printout</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'};
@@ -2175,28 +3156,41 @@ CHOOSE_STUDENTS
 	}
 
 
-        my %all_codes = &Apache::lonnet::get('CODEs',
-					     \@names, $cdom,$cnum);
 	my %code_values;
 	my %codes_to_print;
-	foreach my $key (keys(%all_codes)) {
+	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";
+	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);
 	    }
-	    $code_selection .= '   <choice computer="'.$choice.'">'.$code."</choice>\n";
+	    push(@{$helper->{DATA}{ALL_CODE_CHOICES}},[$code,$choice]);
 	}
-	open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+	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>
+            '.$/;
+
+	}
+
+        my @lines = &Apache::grades::get_scantronformat_file();
 	my $codechoice='';
-	foreach my $line (<FH>) {
+	foreach my $line (@lines) {
 	    my ($name,$description,$code_type,$code_length)=
 		(split(/:/,$line))[0,1,2,4];
 	    if ($code_length > 0 && 
@@ -2208,10 +3202,12 @@ CHOOSE_STUDENTS
 	    $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) &&
@@ -2224,8 +3220,20 @@ CHOOSE_STUDENTS
        </validator>
     </string>
     <message></td></tr><tr><td></message>
-    <message><b>Value of CODE to print?</b></td><td></message>
-    <string variable="SINGLE_CODE" size="10" defaultvalue="zzzz">
+    <message><b>Names to save the CODEs under for later:</b></message>
+    <message></td><td></message>
+    <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+    <message></td></tr><tr><td></message>
+    <message><b>Bubble sheet type:</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+    $codechoice
+    </dropdown>
+    <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
+    <message></td></tr><tr><td></table></message>
+    <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+    <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+    <string variable="SINGLE_CODE" size="10">
         <validator>
 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
@@ -2238,48 +3246,42 @@ CHOOSE_STUDENTS
         </validator>
     </string>
     <message></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></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></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>
+        $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 [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+	    push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
 	}
 	    
 
 	$resource_selector=<<RESOURCE_SELECTOR;
+    <state name="SELECT_RESOURCES" title="Select Resources">
+    $randomly_ordered_warning
+
+    <nextstate>PRINT_FORMATTING</nextstate>
     <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>
@@ -2287,26 +3289,38 @@ 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) &&
@@ -2319,8 +3333,19 @@ CHOOSE_STUDENTS1
        </validator>
     </string>
     <message></td></tr><tr><td></message>
-    <message><b>Value of CODE to print?</b></td><td></message>
-    <string variable="SINGLE_CODE" size="10" defaultvalue="zzzz">
+    <message><b>Names to save the CODEs under for later:</b></message>
+    <message></td><td></message>
+    <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+    <message></td></tr><tr><td></message>
+    <message><b>Bubble sheet type:</b></message>
+    <message></td><td></message>
+    <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+    $codechoice
+    </dropdown>
+    <message></td></tr><tr><td></table></message>
+    <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+    <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+    <string variable="SINGLE_CODE" size="10">
         <validator>
 	   if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
 	      !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
@@ -2333,41 +3358,36 @@ CHOOSE_STUDENTS1
         </validator>
     </string>
     <message></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></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></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>
+        $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 $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';
+    if (($perm{'pav'} 
+	&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
+	&& (defined($helper->{'VARS'}->{'construction'})
+	    ||
+	    (&Apache::lonnet::allowed('bre',$subdir) eq 'F'
+	     && 
+	     $helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
+	    )) 
+	&& $helper->{VARS}->{'assignment'} eq ""
+	) {
+	my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
+        push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from current subdirectory [_3]','<b>','</b>','<b><i>'.$pretty_dir.'</i></b>','<b>','</b>'), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
-  <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
-    <message>(mark them then click "next" button) <br /></message>
+  <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
+
     <files variable="FILES" multichoice='1'>
       <nextstate>PAGESIZE</nextstate>
       <filechoice>return '$subdir';</filechoice>
@@ -2387,8 +3407,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'} && !$is_published) {
+	push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
 			      'select_sequences', 'CHOOSE_SEQUENCE'];
 	my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
 	#Escape apostrophes and backslashes for Perl
@@ -2410,10 +3430,10 @@ 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
@@ -2434,7 +3454,15 @@ CHOOSE_FROM_ANY_SEQUENCE
 
     if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
 	($helper->{VARS}->{'construction'} eq '1')) {
-	addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
+	&addMessage('<br />'
+                   .'<h3>'.&mt('Print Options').'</h3>'
+                   .&Apache::lonhtmlcommon::start_pick_box()
+                   .&Apache::lonhtmlcommon::row_title(
+                       '<label for="ANSWER_TYPE_forminput">'
+                      .&mt('Print Answers')
+                      .'</label>'
+                    )
+        );
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
 	$helper->declareVar('ANSWER_TYPE');         
@@ -2444,16 +3472,52 @@ CHOOSE_FROM_ANY_SEQUENCE
                                    ['Only Answers', 'only']
                                 ];
         Apache::lonhelper::dropdown->new();
-	addMessage("</td></tr>");
+	&addMessage(&Apache::lonhtmlcommon::row_closure());
 	$startedTable = 1;
+
+#
+#  Select font size.
+#
+
+            $helper->declareVar('fontsize');
+            &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Font Size')));
+            my $xmlfrag = << "FONT_SELECTION";
+
+          
+            <dropdown variable='fontsize' multichoice='0', allowempty='0'>
+            <defaultvalue>
+		  return 'normalsize';
+            </defaultvalue>
+            <choice computer='tiny'>Tiny</choice>
+            <choice computer='sub/superscriptsize'>Script Size</choice>
+            <choice computer='footnotesize'>Footnote Size</choice>
+            <choice computer='small'>Small</choice>
+            <choice computer='normalsize'>Normal (default)</choice>
+            <choice computer='large'>larger than normal</choice>
+            <choice computer='Large'>Even larger than normal</choice>
+            <choice computer='LARGE'>Still larger than normal</choice>
+            <choice computer='huge'>huge font size</choice>
+            <choice computer='Huge'>Largest possible size</choice>
+            </dropdown>
+FONT_SELECTION
+            &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+            &addMessage(&Apache::lonhtmlcommon::row_closure(1));
     }
 
     if ($perm{'pav'}) {
 	if (!$startedTable) {
-	    addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
+	    addMessage("<hr width='33%' /><table><tr><td align='right'>".
+                       '<label for="LATEX_TYPE_forminput">'.
+                       &mt('LaTeX mode').
+                       "</label>: </td><td>");
 	    $startedTable = 1;
 	} else {
-	    addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
+	    &addMessage(&Apache::lonhtmlcommon::row_title(
+                           '<label for="LATEX_TYPE_forminput">'
+                           .&mt('LaTeX mode')
+                           .'</label>'
+                        )
+            );
 	}
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'LATEX_TYPE';   
@@ -2469,7 +3533,13 @@ CHOOSE_FROM_ANY_SEQUENCE
 	}
         Apache::lonhelper::dropdown->new();
  
-	addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
+	&addMessage(&Apache::lonhtmlcommon::row_closure()
+                   .&Apache::lonhtmlcommon::row_title(
+                        '<label for="TABLE_CONTENTS_forminput">'
+                       .&mt('Print Table of Contents')
+                       .'</label>'
+                    )
+        );
         $paramHash = Apache::lonhelper::getParamHash();
 	$paramHash->{'variable'} = 'TABLE_CONTENTS';   
 	$helper->declareVar('TABLE_CONTENTS');         
@@ -2477,10 +3547,15 @@ CHOOSE_FROM_ANY_SEQUENCE
                                    ['No', 'no'],
                                    ['Yes', 'yes'] ];
         Apache::lonhelper::dropdown->new();
-	addMessage("</td></tr>");
+	&addMessage(&Apache::lonhtmlcommon::row_closure());
         
 	if (not $helper->{VARS}->{'construction'}) {
-	    addMessage("<tr><td align='right'>Print Index: </td><td>");
+	    &addMessage(&Apache::lonhtmlcommon::row_title(
+                            '<label for="TABLE_INDEX_forminput">'
+                           .&mt('Print Index')
+                           .'</label>'
+                        )
+            );
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'TABLE_INDEX';   
 	    $helper->declareVar('TABLE_INDEX');         
@@ -2488,8 +3563,13 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['No', 'no'],
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
-	    addMessage("</td></tr>");
-	    addMessage("<tr><td align='right'>Print Discussions: </td><td>");
+            &addMessage(&Apache::lonhtmlcommon::row_closure());
+            &addMessage(&Apache::lonhtmlcommon::row_title(
+                            '<label for="PRINT_DISCUSSIONS_forminput">'
+                           .&mt('Print Discussions')
+                           .'</label>'
+                        )
+            );
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';   
 	    $helper->declareVar('PRINT_DISCUSSIONS');         
@@ -2497,45 +3577,108 @@ CHOOSE_FROM_ANY_SEQUENCE
 				     ['No', 'no'],
 				     ['Yes', 'yes'] ];
 	    Apache::lonhelper::dropdown->new();
-	    addMessage("</td></tr>");
+            &addMessage(&Apache::lonhtmlcommon::row_closure());
 
-	    addMessage("<tr><td align = 'right'>  </td><td>");
+	    # Prompt for printing annotations too.
+		
+	    &addMessage(&Apache::lonhtmlcommon::row_title(
+                            '<label for="PRINT_ANNOTATIONS_forminput">'
+                           .&mt('Print Annotations')
+                           .'</label>'
+                        )
+            );
+	    $paramHash = Apache::lonhelper::getParamHash();
+	    $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
+	    $helper->declareVar("PRINT_ANNOTATIONS");
+	    $paramHash->{CHOICES} = [
+				     ['No', 'no'],
+				     ['Yes', 'yes']];
+	    Apache::lonhelper::dropdown->new();
+            &addMessage(&Apache::lonhtmlcommon::row_closure());
+
+            &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Foils')));
 	    $paramHash = Apache::lonhelper::getParamHash();
 	    $paramHash->{'multichoice'} = "true";
 	    $paramHash->{'allowempty'}  = "true";
 	    $paramHash->{'variable'}   = "showallfoils";
-	    $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+	    $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ];
 	    Apache::lonhelper::choices->new();
-	    addMessage("</td></tr>");
+            &addMessage(&Apache::lonhtmlcommon::row_closure(1));
 	}
 
 	if ($helper->{'VARS'}->{'construction'}) { 
-	    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">
-		<defaultvalue>
-	            return $helper->{VARS}->{'curseed'};
-	        </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><tr><td></message>
+	    my $stylevalue='$Apache::lonnet::env{"construct.style"}';
+            my $randseedtext=&mt("Use random seed");
+            my $stylefiletext=&mt("Use style file");
+            my $selectfiletext=&mt("Select style file");
+
+	    my $xmlfrag .= '<message>'
+            .&Apache::lonhtmlcommon::row_title('<label for="curseed_forminput">'
+                                              .$randseedtext
+                                              .'</label>'
+             )
+            .'</message>
+            <string variable="curseed" size="15" maxlength="15">
+                <defaultvalue>
+                   return '.$helper->{VARS}->{'curseed'}.';
+                </defaultvalue>'
+            .'</string>'
+            .'<message>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .&Apache::lonhtmlcommon::row_title('<label for="style_file">'
+                                              .$stylefiletext
+                                              .'</label>'
+             )
+            .'</message>
+             <string variable="style_file" size="40">
+                <defaultvalue>
+                    return '.$stylevalue.';
+                </defaultvalue>
+             </string><message>&nbsp;'
+.qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
+.$selectfiletext.'</a>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils'))
+            .'</message>
 	     <choices allowempty="1" multichoice="true" variable="showallfoils">
-                <choice computer="1">Show all foils?</choice>
-             </choices>
-	     <message></td></tr></message>
-RNDSEED
+                <choice computer="1">&nbsp;</choice>
+             </choices>'
+	    .'<message>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .'</message>';
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
-	    $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
-	    
-	} 
+
+
+            &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Problem Type')));
+	    #
+	    # Initial value from construction space:
+	    #
+	    if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+		$helper->{VARS}->{'probstatus'} = $env{'form.problemtype'};	# initial value
+	    }
+	    $xmlfrag = << "PROBTYPE";
+		<dropdown variable="probstatus" multichoice="0" allowempty="0">
+		   <defaultvalue>
+		      return "$helper->{VARS}->{'probstatus'}";
+                   </defaultvalue>
+		   <choice computer="problem">Homework Problem</choice>
+		   <choice computer="exam">Exam Problem</choice>
+		   <choice computer="survey">Survey question</choice>
+		</dropdown>
+PROBTYPE
+            &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+            &addMessage(&Apache::lonhtmlcommon::row_closure(1));
+
+
+
+        }
     }
 
 
 
 
     if ($startedTable) {
-	addMessage("</table>");
+        &addMessage(&Apache::lonhtmlcommon::end_pick_box());
     }
 
     Apache::lonprintout::page_format_state->new("FORMAT");
@@ -2548,6 +3691,7 @@ RNDSEED
 
     $helper->process();
 
+
     # MANUAL BAILOUT CONDITION:
     # If we're in the "final" state, bailout and return to handler
     if ($helper->{STATE} eq 'FINAL') {
@@ -2631,30 +3775,36 @@ sub render {
     my $PageLayout=&mt('Page layout');
     my $NumberOfColumns=&mt('Number of columns');
     my $PaperType=&mt('Paper type');
-    $result .= <<STATEHTML;
+    my $landscape=&mt('Landscape');
+    my $portrait=&mt('Portrait');
+    my $pdfFormLabel=&mt('PDF-Formfields');
+    my $with=&mt('with Formfields');
+    my $without=&mt('without Formfields');
+    
 
-<hr width="33%" />
-<table cellpadding="3">
-  <tr>
-    <td align="center"><b>$PageLayout</b></td>
-    <td align="center"><b>$NumberOfColumns</b></td>
-    <td align="center"><b>$PaperType</b></td>
-  </tr>
-  <tr>
-    <td>
-      <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">
-STATEHTML
+    $result.='<h3>'.&mt('Layout Options').'</h3>'
+            .&Apache::loncommon::start_data_table()
+            .&Apache::loncommon::start_data_table_header_row()
+            .'<th>'.$PageLayout.'</th>'
+            .'<th>'.$NumberOfColumns.'</th>'
+            .'<th>'.$PaperType.'</th>'
+            .'<th>'.$pdfFormLabel.'</th>'
+            .&Apache::loncommon::end_data_table_header_row()
+            .&Apache::loncommon::start_data_table_row()
+    .'<td>'
+    .'<label><input type="radio" name="'.${var}.'.layout" value="L" />'.$landscape.'</label><br />'
+    .'<label><input type="radio" name="'.${var}.'.layout" value="P" checked="checked" />'.$portrait.'</label>'
+    .'</td>';
+
+    $result.='<td align="center">'
+            .'<select name="'.${var}.'.cols">';
 
     my $i;
     for ($i = 1; $i <= $maxColumns; $i++) {
         if ($i == 2) {
-            $result .= "<option value='$i' selected>$i</option>\n";
+            $result .= '<option value="'.$i.'" selected="selected">'.$i.'</option>'."\n";
         } else {
-            $result .= "<option value='$i'>$i</option>\n";
+            $result .= '<option value="'.$i.'">'.$i.'</option>'."\n";
         }
     }
 
@@ -2670,13 +3820,25 @@ STATEHTML
 	$_=~/(\w+)/;
 	my $papersize=$1;
         if ($paperSize[$i]=~/$DefaultPaperSize/) {
-            $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
+            $result .= '<option selected="selected" value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
         } else {
-            $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
+            $result .= '<option value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
         }
         $i++;
     }
-    $result .= "</select></td></tr></table>";
+    $result .= <<HTML;
+        </select>
+    </td>
+    <td align='center'>
+        <select name='${var}.pdfFormFields'>
+            <option selected="selected" value="no">$without</option>
+            <option value="yes">$with</option>
+        </select>
+    </td>
+HTML
+    $result.=&Apache::loncommon::end_data_table_row()
+            .&Apache::loncommon::end_data_table();
+
     return $result;
 }
 
@@ -2687,7 +3849,7 @@ sub postprocess {
     my $helper = Apache::lonhelper->getHelper();
     $helper->{VARS}->{$var} = 
         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
-        $env{"form.$var.paper"};
+        $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
     return 1;
 }
 
@@ -2738,10 +3900,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;
 }
 
@@ -2751,60 +3913,124 @@ 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 />';
     }
 
-    $result .= <<ELEMENTHTML;
+    my $format = $helper->{VARS}->{$self->{'formatvar'}};
 
-<p>How should the column be formatted?</p>
+    # Use format to get sensible defaults for the margins:
 
-<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'>
-      <select name='$var.widthunit'>
-        <option>cm</option><option>in</option>
-      </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'>
-      <select name='$var.heightunit'>
-        <option>cm</option><option>in</option>
-      </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'>
-      <select name='$var.lmarginunit'>
-        <option>cm</option><option>in</option>
-      </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>
+    my ($laystyle, $cols, $papersize) = split(/\|/, $format);
+    ($papersize)                      = split(/ /, $papersize);
+
+    $laystyle = &Apache::lonprintout::map_laystyle($laystyle);
+
+
+
+    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.
 
-ELEMENTHTML
+    if ($size{'margin_unit'} eq 'in') {
+	$size{'margin'} += 1;
+    }  else {
+	$size{'margin'} += 2.54;
+    }
+    my %lt = &Apache::lonlocal::texthash(
+        'format' => 'How should each column be formatted?',
+        'width'  => 'Width',
+        'height' => 'Height',
+        'margin' => 'Left Margin'
+    );
+
+    $result .= '<p>'.$lt{'format'}.'</p>'
+              .&Apache::lonhtmlcommon::start_pick_box()
+              .&Apache::lonhtmlcommon::row_title($lt{'width'})
+              .'<input type="text" name="'.$var.'.width" value="'.$size{'width'}.'" size="4" />'
+              .'<select name="'.$var.'.widthunit">'
+              .$size{'width_options'}
+              .'</select>'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title($lt{'height'})
+              .'<input type="text" name="'.$var.'.height" value="'.$size{'height'}.'" size="4" />'
+              .'<select name="'.$var.'.heightunit">'
+              .$size{'height_options'}
+              .'</select>'
+              .&Apache::lonhtmlcommon::row_closure()
+              .&Apache::lonhtmlcommon::row_title($lt{'margin'})
+              .'<input type="text" name="'.$var.'.lmargin" value="'.$size{'margin'}.'" size="4" />'
+              .'<select name="'.$var.'.lmarginunit">'
+              .$size{'margin_options'}
+              .'</select>'
+              .&Apache::lonhtmlcommon::row_closure(1)
+              .&Apache::lonhtmlcommon::end_pick_box();
+    # <p>Hint: Some instructors like to leave scratch space for the student by
+    # making the width much smaller than the width of the page.</p>
 
     return $result;
 }
 
-# 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);
+	
+	
+	$laystyle = &map_laystyle($laystyle);
+
+	#  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;
@@ -2827,14 +4053,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) {