[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /interface lonprintout.pm
raeburn
raeburn@source.lon-capa.org
Mon, 23 Aug 2010 20:53:09 -0000
raeburn Mon Aug 23 20:53:09 2010 EDT
Modified files: (Branch: version_2_10_X)
/loncom/interface lonprintout.pm
Log:
- For 2.10, reverse changes from 1.537, 1.538, 1.565.
- We need to revisit bug 5446
- This is the same change as 1.568.2.4 for 2.9.X
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.583 loncom/interface/lonprintout.pm:1.583.2.1
--- loncom/interface/lonprintout.pm:1.583 Wed Aug 4 22:17:14 2010
+++ loncom/interface/lonprintout.pm Mon Aug 23 20:53:09 2010
@@ -2,7 +2,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.583 2010/08/04 22:17:14 raeburn Exp $
+# $Id: lonprintout.pm,v 1.583.2.1 2010/08/23 20:53:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -511,12 +511,12 @@
# %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.
- my $chars_per_line = int($width/1.6); # Character/textline.
+ my $chars_per_line = int($width/2); # Character/textline.
# Default format?
@@ -532,58 +532,37 @@
# - Allow the assignment to be 2 lines (wrapped).
#
-
-
- my $name_length = int($chars_per_line *3 /4);
- my $sec_length = int($chars_per_line / 5);
-
- $format = "%$name_length".'n';
+ 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);
+ }
- if ($section) {
- $format .= ' - Sec: '."%$sec_length".'s';
- }
+ $format = "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
- $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
- if($format =~ /\\\\\s\\\\\s/) {
- #TODO find sensible caption for page header
- my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
- $format =~ s/\\\\\s\\\\\s/$testPrintout/;
- }
- #
- # We're going to trust LaTeX to break lines appropriately, but
- # we'll truncate anything that's more than 3 lines worth of
- # text. This is also assuming (which will probably end badly)
- # nobody's going to embed LaTeX control sequences in the title
- # header or rather that those control sequences won't get broken
- # by the stuff below.
- #
- my $total_length = 3*$chars_per_line;
- if (length($format) > $total_length) {
- $format = substr($format, 0, $total_length);
- }
-
-
return $format;
-
}
#
@@ -1279,8 +1258,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;
}
@@ -1303,6 +1280,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);
@@ -2437,6 +2415,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,
@@ -3081,10 +3060,12 @@
$current_output =~ s/\\\\ Last updated:/Last updated:/
}
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.'}';