--- loncom/interface/lonprintout.pm	2004/11/19 21:48:41	1.339
+++ loncom/interface/lonprintout.pm	2005/02/10 21:05:03	1.360
@@ -1,7 +1,7 @@
-# The LearningOnline Network
+#  The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.339 2004/11/19 21:48:41 albertel Exp $
+# $Id: lonprintout.pm,v 1.360 2005/02/10 21:05:03 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,8 +42,63 @@ use Apache::lonratedt;
 use POSIX qw(strftime);
 use Apache::lonlocal;
 
-my $LaTeXwidth = 0;
+#   Compare two students by name.  The students are in the form
+#   returned by the helper:
+#      user:domain:section:last,   first:status
+#   This is a helper function for the perl sort built-in  therefore:
+# Implicit Inputs:
+#    $a     - The first element to compare (global)
+#    $b     - The second element to compare (global)
+# Returns:
+#   -1   - $a < $b
+#    0   - $a == $b
+#   +1   - $a > $b
+#   Note that the initial comparison is done on the last names with the
+#   first names only used to break the tie.
+#
+#
+sub compare_names {
+    #  First split the names up into the primary fields.
+
+    my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
+    my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
+
+    # Now split the last name and first name of each n:
+    #
+
+    my ($l1,$f1) = split(/,/, $n1);
+    my ($l2,$f2) = split(/,/, $n2);
+
+    # We don't bother to remove the leading/trailing whitespace from the
+    # firstname, unless the last names compare identical.
+
+    if($l1 lt $l2) {
+	return -1;
+    }
+    if($l1 gt $l2) {
+	return  1;
+    }
+
+    # Break the tie on the first name, but there are leading (possibly trailing
+    # whitespaces to get rid of first 
+    #
+    $f1 =~ s/^\s+//;		# Remove leading...
+    $f1 =~ s/\s+$//;		# Trailing spaces from first 1...
+    
+    $f2 =~ s/^\s+//;
+    $f2 =~ s/\s+$//;		# And the same for first 2...
+
+    if($f1 lt $f2) {
+	return -1;
+    }
+    if($f1 gt $f2) {
+	return 1;
+    }
+    
+    #  Must be the same name.
 
+    return 0;
+}
 
 sub latex_header_footer_remove {
     my $text = shift;
@@ -374,8 +429,8 @@ sub character_chart {
 my %page_formats=
     ('letter' => {
 	 'book' => {
-	     '1' => [ '7.1 in','10.2 in', '-0.57 in','-0.57 in','1 cm'],
-	     '2' => ['3.66 in','10.2 in', '-0.57 in','-0.57 in','1 cm']
+	     '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']
 	 },
 	 'album' => {
 	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],
@@ -516,12 +571,12 @@ sub page_format_transformation {
 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
     }
     if ($layout eq 'album') {
-	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
+	    $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 /;
     } elsif ($layout eq 'book') {
 	if ($choice ne 'All class print') { 
-	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
+	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
 	} else {
-	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
+	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1}  \\vskip 5 mm\n /;
 	}
 	if ($papersize eq 'a4') {
 	    $text =~ s/(\\begin{document})/$1\\special{papersize=210mm,297mm}/;
@@ -640,25 +695,26 @@ sub IndexCreation {
 sub print_latex_header {
     my $mode=shift;
     my $output='\documentclass[letterpaper]{article}';
-    if ($mode eq 'batchmode') {
+    if (($mode eq 'batchmode') || (!$ENV{'request.role.adv'})) {
 	$output.='\batchmode';
     }
-    $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'.
-	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'.
-	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}\usepackage{calc}'.
-	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'.
-	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'.
-	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'.
-	     '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'.
-	     '\setlength{\abovedisplayshortskip}{-0.04in}'.
-	     '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
-	     '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'.
-	     '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'.
-	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'.
-	     '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'.
-	     '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'.
-	     '\setlength{\abovedisplayshortskip}{-0.04in}'.
-	     '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}';
+    $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
+	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
+	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+	     '\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;	     
 }
 
@@ -667,7 +723,7 @@ sub path_to_problem {
     my $newurlp = '';
     $colwidth=~s/\s*mm\s*$//;
 #characters average about 2 mm in width
-    if (length($urlp)*2 > $LaTeXwidth) {
+    if (length($urlp)*2 > $colwidth) {
 	my @elements = split '/',$urlp;
 	my $curlength=0;
 	foreach my $element (@elements) {
@@ -730,6 +786,9 @@ sub output_data {
     my %parmhash = %$rparmhash;
     my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
     $r->print(<<ENDPART);
+
+
+
 <html>
 <script type="text/javascript" language="Javascript" >
     var editbrowser;
@@ -777,35 +836,43 @@ ENDPART
     my $LaTeXwidth=&recalcto_mm($textwidth); 
     my @print_array=();
     my @student_names=();
+
+    #  Common settings for the %form has:
+    # In some cases these settings get overriddent by specific cases, but the
+    # settings are common enough to make it worthwhile factoring them out
+    # here.
+    #
+    my %form;
+    $form{'grade_target'} = 'tex';
+    $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
     
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
-	my $currentURL;
+	my ($currentURL,$cleanURL);
 	if ($helper->{'VARS'}->{'construction'} ne '1') {
             #prints published resource
 	    $currentURL=$helper->{'VARS'}->{'postdata'};
+	    $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
 	} else {
             #prints resource from the construction space
 	    $currentURL='/'.$helper->{'VARS'}->{'filename'};
 	    if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
+	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
-	if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+	if ($cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
 	    my $texversion='';
 	    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
 		my %moreenv;
-		$moreenv{'request.filename'}=$currentURL;
+		$moreenv{'request.filename'}=$cleanURL;
 		if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
 		    $moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
 		    my $dom = $ENV{'user.domain'};
 		    my $user = $ENV{'user.name'};
 		    my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
 		}
-		my %form;
                 if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -824,7 +891,7 @@ ENDPART
 	    }
 	    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 	       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		my %form;
+		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'grade_target'}='answer';
 		$form{'answer_output_mode'}='tex';
 		$form{'rndseed'}=$rndseed;
@@ -835,10 +902,10 @@ ENDPART
 		    $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 ';
-			$texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
+			$texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
 		    } else {
 			$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
-			my $URLpath=$currentURL;
+			my $URLpath=$cleanURL;
 			$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
 			$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
 		    }
@@ -871,9 +938,6 @@ ENDPART
 		if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 		    my $texversion='';
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
-			my %form;
-			$form{'grade_target'}='tex';
-			$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 			$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 			$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -883,10 +947,10 @@ ENDPART
 		    if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && 
 		       ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
-			my %form;
 			$form{'grade_target'}='answer';
 			$form{'answer_output_mode'}='tex';
 			$form{'rndseed'}=$rndseed;
+			$form{'problem_split'}=$parmhash{'problem_stream_switch'};
                         if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
 			my $answer=&Apache::lonnet::ssi($urlp,%form);
 			if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
@@ -917,10 +981,7 @@ ENDPART
 	    }
 	    if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
 	    $result .= '\end{document}';   
-	} elsif ($currentURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
-		my %form;
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
+	} elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
 		my $texversion=&Apache::lonnet::ssi($currentURL,%form);
@@ -928,9 +989,10 @@ ENDPART
 	} else {
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'});
 	}
-    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
+    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
-             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') or
+             ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
+	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
         #-- produce an output string
 	if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
@@ -939,12 +1001,11 @@ ENDPART
 	    $selectionmade = 3;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
 	    $selectionmade = 4;
+	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') {  #BUGBUG
+	    $selectionmade = 4;
 	} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
 	    $selectionmade = 7;
 	}
-	my %form=();	   
-	$form{'grade_target'}='tex';
-	$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 	$form{'suppress_tries'}=$parmhash{'suppress_tries'};
 	$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -953,10 +1014,23 @@ ENDPART
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	my %page_breaks;
+	foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
+	    $page_breaks{$break} = 1;
+	}
 	my $prevassignment='';
 	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonxml::init_counter();
 	for (my $i=0;$i<=$#master_seq;$i++) {
+
+	    # Note due to document structure, not allowed to put \newpage
+	    # prior to the first resource
+
+	    if (defined $page_breaks{$master_seq[$i]}) {
+		if($i != 0) {
+		    $result.="\\newpage\n";
+		}
+	    }
 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    $urlp=&Apache::lonnet::clutter($urlp);
 	    $form{'symb'}=$master_seq[$i];
@@ -964,7 +1038,6 @@ ENDPART
 	    my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
 	    if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
 	    if ($i==0) {$prevassignment=$assignment;}
-	    #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
 	    my $texversion='';
 	    if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
 		$texversion.=&Apache::lonnet::ssi($urlp,%form);
@@ -982,7 +1055,6 @@ ENDPART
 		my $current_counter=$ENV{'form.counter'};
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		    my %form;
 		    $form{'grade_target'}='answer';
 		    $form{'answer_output_mode'}='tex';
 		    my $answer=&Apache::lonnet::ssi($urlp,%form);
@@ -1018,9 +1090,6 @@ ENDPART
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
 	    } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
-		my %form;
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 		$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
 		if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
@@ -1044,10 +1113,14 @@ ENDPART
 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
 	}
 	&Apache::lonnet::delenv('form.counter');
-	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
+	if ($flag_page_in_sequence eq 'YES') {
+	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+	}	
 	$result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
+
+
      #-- prints assignments for whole class or for selected students  
 	 my $type;
 	 if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
@@ -1058,21 +1131,34 @@ ENDPART
 	     $type='resources';
 	 }
 	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+	 #   The normal sort order is by section then by students within the
+	 #   section. If the helper var student_sort is 1, then the user has elected
+	 #   to override this and output the students by name.
+	 #    Each element of the students array is of the form:
+	 #       username:domain:section:last, first:status
+	 #    
+	 #   
+	 if ($helper->{'VARS'}->{'student_sort'}    eq 1) {
+	     @students = sort compare_names  @students;
+	 }
          if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+
 	 #loop over students
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %moreenv;
          $moreenv{'instructor_comments'}='hide';
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
 	 $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
 	 if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
 	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
 	 my $student_counter=-1;
 	 foreach my $person (@students) {
+
              my $duefile="/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
 	     if (-e $duefile) {
 		 my $temp_file = Apache::File->new('>>'.$duefile);
@@ -1080,7 +1166,11 @@ ENDPART
 	     }
 	     $student_counter++;
 	     my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
-	     my ($output,$fullname)=&print_resources($r,$helper,$person,$type,\%moreenv,\@master_seq,$flag_latex_header_remove);
+	     my ($output,$fullname)=&print_resources($r,$helper,
+						     $person,$type,
+						     \%moreenv,\@master_seq,
+						     $flag_latex_header_remove,
+						     $LaTeXwidth);
 	     $print_array[$i].=$output;
 	     $student_names[$i].=$person.':'.$fullname.'_END_';
 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
@@ -1097,6 +1187,7 @@ ENDPART
 	 my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
 	 my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
 	 my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
+	 $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
 	 my $seed=time+($$<<16)+($$);
 	 my @allcodes;
 	 if ($old_name) {
@@ -1130,7 +1221,8 @@ ENDPART
 	     $moreenv{'CODE'}=&num_to_letters($code);
 	     my ($output,$fullname)=
 		 &print_resources($r,$helper,'anonymous',$type,\%moreenv,
-				  \@master_seq,$flag_latex_header_remove);
+				  \@master_seq,$flag_latex_header_remove,
+				  $LaTeXwidth);
 	     $print_array[$file_num].=$output;
 	     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
 				       &mt('last assignment').' '.$fullname);
@@ -1154,9 +1246,7 @@ ENDPART
 	    my $urlp = $list_of_files[$i];
 	    $urlp=~s|//|/|;
 	    if ($urlp=~/\//) {
-		my %form;
-		$form{'grade_target'}='tex';
-		$form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
+		$form{'problem_split'}=$parmhash{'problem_stream_switch'};
 		$form{'rndseed'}=$rndseed;
 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
@@ -1166,7 +1256,6 @@ ENDPART
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
-		    my %form;
 		    $form{'grade_target'}='answer';
 		    $form{'answer_output_mode'}='tex';
 		    $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -1276,7 +1365,7 @@ ENDPART
     my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} ne '1') {
 	#prints published resource
-	$URLback=$helper->{'VARS'}->{'postdata'};
+	$URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
     } else {
 	#prints resource from the construction space
 	$URLback='/'.$helper->{'VARS'}->{'filename'};
@@ -1330,7 +1419,8 @@ sub get_CODE {
 }
 
 sub print_resources {
-    my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header)=@_;
+    my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
+	$LaTeXwidth)=@_;
     my $current_output = ''; 
     my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);
@@ -1339,11 +1429,22 @@ sub print_resources {
 	$namepostfix="\\\\Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+    my %page_breaks;
+    foreach my $break (split /\|\|\|/,$helper->{'VARS'}->{'FINISHPAGE'}) {
+	$page_breaks{$break} = 1;
+    }
+    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();
     foreach my $curresline (@{$master_seq})  {
+	if (defined $page_breaks{$curresline}) {
+	    if($i != 0) {
+		$current_output.= "\\newpage\n";
+	    }
+	}
+	$i++;
 	if ( !($type eq 'problems' && 
 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
@@ -1448,13 +1549,15 @@ sub handler {
 #	return OK;
 
     my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
-    
+ 
 #	my $key; 
 #	foreach $key (keys %parmhash) {
 #	    $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
 #	}
-#	return OK;
+#
 
+
+			 
     &output_data($r,$helper,\%parmhash);
     return OK;
 } 
@@ -1507,6 +1610,7 @@ sub printHelper {
     $helper->declareVar('construction');
     $helper->declareVar('assignment');
     $helper->declareVar('style_file');
+    $helper->declareVar('student_sort');
     
     # This will persistently load in the data we want from the
     # very first screen.
@@ -1533,7 +1637,8 @@ sub printHelper {
         $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
 
     }
-    
+    $helper->{VARS}->{'symb'}=
+	&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
 
@@ -1551,7 +1656,8 @@ sub printHelper {
                          0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
     } else {
         ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
-        $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+        $helper->{VARS}->{'postdata'} = 
+	    &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
 
         if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
             my $postdata = $helper->{VARS}->{'postdata'};
@@ -1606,8 +1712,8 @@ sub printHelper {
     my $isNotMap = '!$res->is_sequence()';
     $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isMap = '$res->is_map()';
-    my $symbFilter = '$res->symb()';
-    my $urlValue = '$res->src()';
+    my $symbFilter = '$res->shown_symb()';
+    my $urlValue = '$res->link()';
 
     $helper->declareVar('SEQUENCE');
 
@@ -1617,6 +1723,7 @@ sub printHelper {
 
     # If we're in a sequence...
     if (($helper->{'VARS'}->{'construction'} ne '1') &&
+
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
@@ -1633,6 +1740,7 @@ sub printHelper {
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 
@@ -1644,6 +1752,7 @@ sub printHelper {
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 HELPERFRAGMENT
@@ -1651,11 +1760,13 @@ HELPERFRAGMENT
 	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
     }
 
-    # If the user is priviledged, allow them to print all 
-    # problems in the course, optionally for selected students
+    # If the user is privileged, allow them to print all 
+    # problems and resources  in the entier course, optionally for selected students
     if ($userPriviledged && 
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
+
         push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+	push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
          &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>
@@ -1665,6 +1776,18 @@ HELPERFRAGMENT
       <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
+    </resource>
+  </state>
+  <state name="ALL_RESOURCES" title="Select Resource(s) to print">
+    <message>(Mark them then click "next" button) <br /> </message>
+    <resource variable="RESOURCES" toponly='0' multichoice='1'
+              suppressEmptySequences='0' addstatus='1' closeallpages='1'>
+      <nextstate>PAGESIZE</nextstate>
+      <filterfunc>return $isNotMap; </filterfunc>
+      <mapurl> $map</mapursl>
+      <valuefunc>return $symbFilter;</valuefunc>
+      <option text='NewPage' variable='FINISHPAGE' />
     </resource>
   </state>
 ALL_PROBLEMS
@@ -1680,6 +1803,7 @@ ALL_PROBLEMS
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='New Page' variable='FINISHPAGE' />
       </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
@@ -1695,6 +1819,11 @@ RESOURCE_SELECTOR
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
       <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+      <message><b>Select sort order</b> </message>
+    <choices variable='student_sort'>
+      <choice computer='0'>Sort by section then student</choice>
+      <choice computer='1'>Sort by students across sections.</choice>
+    </choices>
     $resource_selector
   </state>
 CHOOSE_STUDENTS
@@ -1738,6 +1867,7 @@ CHOOSE_ANON1
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
@@ -1753,6 +1883,11 @@ RESOURCE_SELECTOR
 	&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
   <state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
     <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+    <choices variable='student_sort'>
+      <choice computer='0'>Sort by section then student</choice>
+      <choice computer='1'>Sort by students across sections.</choice>
+    </choices>
+
     $resource_selector
     </state>
 CHOOSE_STUDENTS1
@@ -1816,6 +1951,7 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
@@ -1826,6 +1962,7 @@ CHOOSE_FROM_SUBDIR
       <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 CHOOSE_FROM_ANY_SEQUENCE