--- loncom/interface/lonprintout.pm	2006/07/03 12:59:58	1.454
+++ loncom/interface/lonprintout.pm	2006/07/03 13:48:41	1.455
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.454 2006/07/03 12:59:58 foxr Exp $
+# $Id: lonprintout.pm,v 1.455 2006/07/03 13:48:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -758,16 +758,16 @@ sub page_format_transformation {
     my $name = &get_name();
     my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
-    my $HeaderText  = $parmhash{'print_header_format'};
-    $HeaderText     = &format_page_header($HeaderText, $assignment, $courseidinfo, $name);
-    &Apache::lonnet::logthis("Header Format: $HeaderText");
+    my $header_text  = $parmhash{'print_header_format'};
+    $header_text     = &format_page_header($header_text, $assignment,
+					   $courseidinfo, $name);
     my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
     my $fancypagestatement='';
     if ($numberofcolumns eq '2') {
-	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$HeaderText}";
+	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
     } else {
-	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$HeaderText}";
+	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
     }
     if ($layout eq 'album') {
 	    $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 /;
@@ -1406,16 +1406,15 @@ ENDPART
 		    my $courseidinfo = &get_course();
 		    if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
 		    $prevassignment=$assignment;
-		    my $HeaderText = $parmhash{'print_header_format'};
-		    $HeaderText    = &format_page_header($HeaderText,
-							 $assignment, 
-							 $courseidinfo, 
-							 $name);
-		    &Apache::lonnet::logthis("Hdr Format $HeaderText");
+		    my $header_text = $parmhash{'print_header_format'};
+		    $header_text    = &format_page_header($header_text,
+							  $assignment, 
+							  $courseidinfo, 
+							  $name);
 		    if ($numberofcolumns eq '1') {
-			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$HeaderText.'}} \vskip 5 mm ';
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
 		    } else {
-			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$HeaderText.'}} \vskip 5 mm ';
+			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\fancyhead[LO]{'.$header_text.'}} \vskip 5 mm ';
 		    }			
 		}
 		$result .= $texversion;