--- loncom/interface/lonprintout.pm	2006/08/28 11:11:49	1.483
+++ loncom/interface/lonprintout.pm	2006/10/23 10:40:09	1.489
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.483 2006/08/28 11:11:49 foxr Exp $
+# $Id: lonprintout.pm,v 1.489 2006/10/23 10:40:09 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -23,7 +23,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # /home/httpd/html/adm/gpl.txt
-#
 # http://www.lon-capa.org/
 #
 #
@@ -50,6 +49,33 @@ my %perm;
 my %parmhash;
 my $resources_printed;
 
+#
+#   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) = @_;
+
+    while ($format_string =~m/%\d*\Q$item\E/) {
+	my $fmt = $1;
+	my $size = $2;
+	my $subst = $repl;
+	if ($size ne "") {
+	    $subst = substr($subst, 0, $size);
+	}
+	my $newpos =  pos($format_string) + length($subst) - length($fmt);
+	$format_string =~ s/\Q$fmt\E/$subst/;
+	pos($format_string)=$newpos;
+    }
+    return $format_string;
+}
+
 
 # Format a header according to a format.  
 # 
@@ -60,17 +86,54 @@ my $resources_printed;
 #     %n    - Student name.
 #
 sub format_page_header {
-    my ($format, $assignment, $course, $student) = @_;
+    my ($width, $format, $assignment, $course, $student) = @_;
     
+    $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 $firstline = "$student $course";
+	if (length($firstline) > $chars_per_line) {
+	    my $lastchar = $chars_per_line - length($student) - 1;
+	    if ($lastchar > 0) {
+		$course = substr($course, 0, $lastchar);
+	    } else {		# Nothing left of course:
+		$course = '';
+	    }
+	}
+	if (length($assignment) > $chars_per_line) {
+	    $assignment = substr($assignment, 0, $chars_per_line);
+	}
+	
 	$format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
 	
     } else {
-	$format =~ s/%a/$assignment/g;
-	$format =~ s/%c/$course/g;
-	$format =~ s/%n/$student/g;
+	# 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);
+
+	# 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!!!
+
+	$format =~ s/%/\\%/g;
     }
     
 
@@ -628,8 +691,8 @@ my %page_formats=
 	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
 	 },
 	 'album' => {
-	     '1' => [ '8.8 in', '6.8 in','-0.55 in',  '-0.83 in','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','1 cm'],
+	     '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 in','3.5 in']
 	 },
      },
      'legal' => {
@@ -761,7 +824,7 @@ sub page_format_transformation {
     my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     my $header_text  = $parmhash{'print_header_format'};
-    $header_text     = &format_page_header($header_text, $assignment,
+    $header_text     = &format_page_header($textwidth, $header_text, $assignment,
 					   $courseidinfo, $name);
     my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
@@ -1467,7 +1530,7 @@ ENDPART
 		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		    $prevassignment=$assignment;
 		    my $header_text = $parmhash{'print_header_format'};
-		    $header_text    = &format_page_header($header_text,
+		    $header_text    = &format_page_header($textwidth, $header_text,
 							  $assignment, 
 							  $courseidinfo, 
 							  $name);
@@ -2005,7 +2068,7 @@ sub print_resources {
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $header_line =
-	&format_page_header($parmhash{'print_header_format'},
+	&format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
 			    $currentassignment, $courseidinfo, $fullname);
     my $header_start = ($columns_in_format == 1) ? '\lhead'
 	                                         : '\fancyhead[LO]';
@@ -2383,7 +2446,7 @@ RESOURCE_SELECTOR
 
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
-      <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>