--- loncom/interface/lonprintout.pm	2012/05/28 10:44:42	1.617
+++ loncom/interface/lonprintout.pm	2012/06/11 11:07:33	1.619
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.617 2012/05/28 10:44:42 foxr Exp $
+# $Id: lonprintout.pm,v 1.619 2012/06/11 11:07:33 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1233,6 +1233,22 @@ sub is_code_valid {
     }
 
 }
+#
+# Compare two students by section (Used to sort by section).
+#
+#  Implicit inputs, 
+#    $a - The first one
+#    $b - The second one.
+#
+#  Returns:
+#     a-section cmp b-section
+#
+sub compare_sections {
+    my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
+    my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
+
+    return $s1 cmp $s2;
+}
 
 #   Compare two students by name.  The students are in the form
 #   returned by the helper:
@@ -3002,7 +3018,6 @@ ENDPART
 							  $assignment, 
 							  $courseidinfo, 
 							  $name);
-
 		    if ($numberofcolumns eq '1') {
 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
 		    } else {
@@ -3103,6 +3118,8 @@ ENDPART
 	 if (($helper->{'VARS'}->{'student_sort'}    eq 1)  && 
 	     ($helper->{'VARS'}->{'SPLIT_PDFS'} ne "sections")) {
 	     @students = sort compare_names  @students;
+	 } else {
+	     @students = sort compare_sections @students; 
 	 }
 	 &adjust_number_to_print($helper);
 
@@ -3512,6 +3529,8 @@ sub print_resources {
     my $fullname = &get_name($username,$userdomain);
     my $namepostfix = "\\\\";	# Both anon and not anon should get the same vspace.
 
+
+
     #
     # Figure out if we need to filter the output by
     # the incomplete problems for that person
@@ -3550,6 +3569,10 @@ sub print_resources {
     #
 
     my $syllabus_first = 0;
+    my $current_assignment = "";
+    my $assignment;
+    my $courseidinfo = &get_course();
+
     foreach my $curresline (@{$master_seq})  {
 	if (defined $page_breaks{$curresline}) {
 	    if($i != 0) {
@@ -3558,9 +3581,12 @@ sub print_resources {
 	}
 	$current_output .= &get_extra_vspaces($helper, $curresline);
 	$i++;
+	my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
+
+	# See if we need to emit a new header:
+
 	if ( !($type eq 'problems' && 
 	       ($curresline!~ m/$LONCAPA::assess_page_re/)) ) {
-	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
 		next;
 	    }
@@ -3664,6 +3690,19 @@ sub print_resources {
 	    }
 	    $remove_latex_header = 'YES';
 	}
+	$assignment = &Apache::lonxml::latex_special_symbols(
+	    &Apache::lonnet::gettitle($map), 'header');
+	if (($assignment ne $current_assignment) && ($assignment ne "")) {
+	    my $header_line = &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+						  $assignment, $courseidinfo, 
+						  $fullname, $usersection);
+	    my $header_start = ($columns_in_format == 1) ? '\lhead'
+		: '\fancyhead[LO]';
+	    $header_line = $header_start.'{'.$header_line.'}';
+	    $current_output = $current_output . $header_line;
+	    $current_assignment = $assignment;
+	}
+
 	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
     # If we are printing incomplete it's possible we don't have
@@ -3684,24 +3723,32 @@ sub print_resources {
     if ($syllabus_first) {
         $current_output =~ s/\\\\ Last updated:/Last updated:/
     }
-    my $courseidinfo = &get_course();
-    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 (0) {
+	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$header_line$namepostfix}\\vskip 5 mm /;
+#	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
+	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$namepostfix}\\vskip 5 mm /;
+
     } else {
 	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;
 	$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;
+	    '\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent'
+	    .$namepostfix. '} \vskip 5 mm '.$current_output;
+
     }
     #
     #  Close the student bracketing.