--- loncom/interface/lonprintout.pm	2004/08/12 06:31:09	1.320
+++ loncom/interface/lonprintout.pm	2004/08/19 01:23:32	1.327
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.320 2004/08/12 06:31:09 albertel Exp $
+# $Id: lonprintout.pm,v 1.327 2004/08/19 01:23:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -373,85 +373,110 @@ sub character_chart {
 }
 
 
+                  #width, height, oddsidemargin, evensidemargin, topmargin
+my %page_formats=
+    ('letter' => {
+	 'book' => {
+	     '1' => [ '7.1 in','10.2 in', '-0.57 in','-0.57 in','0 in'],
+	     '2' => ['3.66 in','10.2 in', '-0.57 in','-0.57 in','0 in']
+	 },
+	 'album' => {
+	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','0 in'],
+	     '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
+	 },
+     },
+     'legal' => {
+	 'book' => {
+	     '1' => ['7.1 in','13 in',,'-0.57 in','-0.57 in','-0.5 in'],
+	     '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']
+	 },
+	 'album' => {
+	     '1' => [],
+	     '2' => []
+          },
+     },
+     'tabloid' => {
+	 'book' => {
+	     '1' => ['9.8 in','16 in','-0.57 in','-0.57 in','-0.5 in'],
+	     '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
+	 },
+	 'album' => {
+	     '1' => [],
+	     '2' => []
+          },
+     },
+     'executive' => {
+	 'book' => {
+	     '1' => ['6.8 in','9 in','-0.57 in','-0.57 in','1.2 in'],
+	     '2' => ['3.1 in','9 in','-0.57 in','-0.57 in','1.2 in']
+	 },
+	 'album' => {
+	     '1' => [],
+	     '2' => []
+          },
+     },
+     'a2' => {
+	 'book' => {
+	     '1' => [],
+	     '2' => []
+	 },
+	 'album' => {
+	     '1' => [],
+	     '2' => []
+          },
+     },
+     'a3' => {
+	 'book' => {
+	     '1' => [],
+	     '2' => []
+	 },
+	 'album' => {
+	     '1' => [],
+	     '2' => []
+          },
+     },
+     'a4' => {
+	 'book' => {
+	     '1' => ['176 mm','272 mm','-40 pt in','-60 pt','-0.5 in'],
+	     '2' => [ '91 mm','272 mm','-40 pt in','-60 pt','-0.5 in']
+	 },
+	 'album' => {
+	     '1' => ['8.5 in','7.7 in','-40 pt in','-60 pt','0 in'],
+	     '2' => ['3.9 in','7.7 in','-40 pt in','-60 pt','0 in']
+	 },
+     },
+     'a5' => {
+	 'book' => {
+	     '1' => [],
+	     '2' => []
+	 },
+	 'album' => {
+	     '1' => [],
+	     '2' => []
+          },
+     },
+     'a6' => {
+	 'book' => {
+	     '1' => [],
+	     '2' => []
+	 },
+	 'album' => {
+	     '1' => [],
+	     '2' => []
+          },
+     },
+     );
+
 sub page_format {
 #
-#Correspondence between $papersize variable and real paper format:
-# 0 - "Letter [8 1/2x11 in]"
-# 1 - "Legal [8 1/2x14 in]"
-# 2 - "Ledger/Tabloid [11x17 in]"
-# 3 - "Executive [7 1/2x10 in]"
-# 4 - "A2 [420x594 mm]"
-# 5 - "A3 [297x420 mm]"
-# 6 - "A4 [210x297 mm]"
-# 7 - "A5 [148x210 mm]"
-# 8 - "A6 [105x148 mm]"
+#Supported paper format: "Letter [8 1/2x11 in]",      "Legal [8 1/2x14 in]",
+#                        "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
+#                        "A2 [420x594 mm]",           "A3 [297x420 mm]",
+#                        "A4 [210x297 mm]",           "A5 [148x210 mm]",
+#                        "A6 [105x148 mm]"
 # 
     my ($papersize,$layout,$numberofcolumns) = @_; 
-    my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);
-    if ($papersize eq '0') {
-	if ($layout eq 'book') {
-	    if ($numberofcolumns == 1) {
-		$textwidth = '7.1 in';      #'18 cm';
-		$textheight = '10.2 in';    #'25.9 cm';
-		$oddoffset = '-0.57 in';
-		$evenoffset = '-0.57 in';
-	    } elsif ($numberofcolumns == 2) {
-		$textwidth = '3.66 in';     #'93 mm';
-		$textheight = '10.2 in';    #'25.9 cm';
-		$oddoffset = '-0.57 in';
-		$evenoffset = '-0.57 in';
-	    }
-	} elsif ($layout eq 'album') {
-	    if ($numberofcolumns eq '1') {
-		$textwidth = '8.8 in';
-		$textheight = '6.8 in';
-		$oddoffset = '-40 pt';
-		$evenoffset = '-60 pt';
-	    } elsif ($numberofcolumns == 2) {
-		$textwidth = '4.4 in';
-		$textheight = '6.8 in';
-		$oddoffset = '-0.5 in';
-		$evenoffset = '-1.5 in';
-		$topmargin = '3.5 in';
-	    }
-	}
-#    } elsif($papersize eq '1') {
-#    } elsif($papersize eq '2') {
-#    } elsif($papersize eq '3'/) {
-    } elsif($papersize eq '6') {
-	if ($layout eq 'book') {
-	    if ($numberofcolumns == 1) {
-		$textwidth = '176 mm';
-		$textheight = '272 mm';
-		$oddoffset = '-0.57 in';
-		$evenoffset = '-0.57 in';
-		$topmargin = '-0.5 in';
-	    } elsif ($numberofcolumns == 2) {
-		$textwidth = '91 mm';
-		$textheight = '272 mm';
-		$oddoffset = '-0.57 in';
-		$evenoffset = '-0.57 in';
-		$topmargin = '-0.5 in';
-	    }
-	} elsif ($layout eq 'album') {
-	    if ($numberofcolumns eq '1') {
-		$textwidth = '8.5 in';
-		$textheight = '7.7 in';
-		$oddoffset = '-40 pt';
-		$evenoffset = '-60 pt';
-	    } elsif ($numberofcolumns == 2) {
-		$textwidth = '3.9 in';
-		$textheight = '7.7 in';
-		$oddoffset = '-40 pt';
-		$evenoffset = '-60 pt';
-	    }
-	}
-#    } elsif($papersize eq '5') {
-#    } elsif($papersize eq '4') {
-#    } elsif($papersize eq '7') {
-#    } elsif($papersize eq '8') {
-    }
-    return $textwidth,$textheight,$oddoffset,$evenoffset,$topmargin;
+    return @{$page_formats{$papersize}->{$layout}->{$numberofcolumns}};
 }
 
 
@@ -487,16 +512,21 @@ sub page_format_transformation {
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
     my $topmargintoinsert = '';
     if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
+    my $fancypagestatement='';
+    if ($numberofcolumns eq '2') {
+	$fancypagestatement="\\fancyhead{}\\fancyhead[LO]{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+    } else {
+	$fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+    }
     if ($layout eq 'album') {
-	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
+	    $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
     } elsif ($layout eq 'book') {
-
 	if ($choice ne 'All class print') { 
-	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
+	    $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/;
 	} else {
 	    $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1}  \\vskip 5 mm /;
 	}
-	if ($papersize eq '6') {
+	if ($papersize eq 'a4') {
 	    $text =~ s/(\\begin{document})/$1\\special{papersize=210mm,297mm}/;
 	}
     }
@@ -1623,7 +1653,7 @@ sub printHelper {
     </state>
 HELPERFRAGMENT
 
-        &Apache::lonxml::xmlparse($r, 'helper', $helperFragment); 
+	&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
     }
 
     # If the user is priviledged, allow them to print all 
@@ -1975,10 +2005,10 @@ use strict;
 use Apache::lonlocal;
 
 my $maxColumns = 2;
-my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]", 
-                 "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
-                 "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]", 
-                 "A5 [148x210 mm]", "A6 [105x148 mm]" );
+my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]", 
+                 "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
+                 "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]", 
+                 "a5 [148x210 mm]", "a6 [105x148 mm]" );
 
 # Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
 #                   Paper type
@@ -2038,14 +2068,15 @@ STATEHTML
     if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
     $i = 0;
     foreach (@paperSize) {
+	$_=~/(\w+)/;
+	my $papersize=$1;
         if ($paperSize[$i]=~/$DefaultPaperSize/) {
-            $result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
+            $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
         } else {
-            $result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
+            $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
         }
         $i++;
     }
-
     $result .= "</select></td></tr></table>";
     return $result;
 }