[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface lonprintout.pm

[raeburn]

raeburn		Mon Dec 22 22:28:18 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/interface	lonprintout.pm 
  Log:
  - Reverse changes in 1.537 for 2.8.X.
    - reopen bug 5446 and explore alternatives that do not add a third row.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.545.2.2 loncom/interface/lonprintout.pm:1.545.2.3
--- loncom/interface/lonprintout.pm:1.545.2.2	Sun Dec 21 16:29:56 2008
+++ loncom/interface/lonprintout.pm	Mon Dec 22 22:28:18 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.545.2.2 2008/12/21 16:29:56 raeburn Exp $
+# $Id: lonprintout.pm,v 1.545.2.3 2008/12/22 22:28:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -229,11 +229,9 @@
 #     %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) = @_;
-
+    my ($width, $format, $assignment, $course, $student) = @_;
     
     $width = &recalcto_mm($width); # Get width in mm.
     #  Default format?
@@ -251,34 +249,34 @@
 	#
 	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}";
 
-	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';
-        
-
+    } else {
+        # 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!!!
     }
-    # 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
@@ -985,8 +983,6 @@
     my $courseidinfo;
     if (defined($env{'request.course.id'})) {
 	$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
-	my $sec = $env{'request.course.sec'};
-	    
     }
     return $courseidinfo;
 }
@@ -1009,6 +1005,7 @@
 
     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);
@@ -1811,6 +1808,7 @@
 		if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
 		    my $name = &get_name();
 		    my $courseidinfo = &get_course();
+		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		    $prevassignment=$assignment;
 		    my $header_text = $parmhash{'print_header_format'};
 		    $header_text    = &format_page_header($textwidth, $header_text,
@@ -2395,10 +2393,12 @@
 	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);
+			    $currentassignment, $courseidinfo, $fullname);
     my $header_start = ($columns_in_format == 1) ? '\lhead'
 	                                         : '\fancyhead[LO]';
     $header_line = $header_start.'{'.$header_line.'}';