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

[raeburn]

raeburn		Sat Nov  9 15:40:00 2024 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  - Restore page number to right side of header line after changes in 1.537.
  - For two column printouts add column number to right side of header line
    for even-numbered columns, unless course uses customized header.
  - Remove default fancyfooter found below the bottom of the page/column.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.699 loncom/interface/lonprintout.pm:1.700
--- loncom/interface/lonprintout.pm:1.699	Fri Nov  8 20:37:25 2024
+++ loncom/interface/lonprintout.pm	Sat Nov  9 15:40:00 2024
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.699 2024/11/08 20:37:25 raeburn Exp $
+# $Id: lonprintout.pm,v 1.700 2024/11/09 15:40:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1223,6 +1223,7 @@
 	if ($section) {
 	    $format .=  ' - Sec: '."%$sec_length".'s';
 	}
+	$format .= '\\hfill\\thepage';
 
 	$format .= '\\\\%c \\\\ %a';
 
@@ -2009,9 +2010,13 @@
     my $fancypagestatement='';
     if ($numberofcolumns eq '2') {
 	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{$header_text}";
+	if ($parmhash{'print_header_format'} eq '') {
+	    $fancypagestatement .= "\\fancyhead[RE]{\\thepage \\\\[\\baselineskip]}";
+	}
     } else {
 	$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
     }
+    $fancypagestatement .= "\\fancyfoot{}";
     my ($paperwidth,$paperheight);
     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\\usepackage{booktabs}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;