--- loncom/interface/lonprintout.pm	2004/08/13 17:14:48	1.322
+++ loncom/interface/lonprintout.pm	2004/08/13 17:40:55	1.323
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.322 2004/08/13 17:14:48 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.323 2004/08/13 17:40:55 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -415,6 +415,7 @@ sub page_format {
 		$topmargin = '3.5 in';
 	    }
 	}
+<<<<<<< lonprintout.pm
     } elsif($papersize eq '1') {
 	if ($layout eq 'book') {
 	    if ($numberofcolumns == 1) {
@@ -447,8 +448,8 @@ sub page_format {
     } elsif($papersize eq '2') {
 	if ($layout eq 'book') {
 	    if ($numberofcolumns == 1) {
-		$textwidth = '7.1 in';      
-		$textheight = '15 in';    
+		$textwidth = '9.8 in';      
+		$textheight = '16 in';    
 		$oddoffset = '-0.57 in';
 		$evenoffset = '-0.57 in';
 		$topmargin = '-0.5 in';
@@ -473,7 +474,35 @@ sub page_format {
 #		$topmargin = '3.5 in';
 	    }
 	}
-#    } elsif($papersize eq '3'/) {
+    } elsif($papersize eq '3') {
+	if ($layout eq 'book') {
+	    if ($numberofcolumns == 1) {
+		$textwidth = '7 in';      
+		$textheight = '9 in';    
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+		$topmargin = '-0.5 in';
+	    } elsif ($numberofcolumns == 2) {
+		$textwidth = '3.5 in';     
+		$textheight = '9 in';    
+		$oddoffset = '-0.57 in';
+		$evenoffset = '-0.57 in';
+		$topmargin = '-0.5 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 '6') {
 	if ($layout eq 'book') {
 	    if ($numberofcolumns == 1) {
@@ -1360,7 +1389,9 @@ sub print_resources {
     my $current_output = ''; 
     my ($username,$userdomain,$usersection) = split /:/,$person;
     my $fullname = &get_name($username,$userdomain);
+    my $namepostfix;
     if ($person =~ 'anon') {
+	$namepostfix="\\\\Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
     #goes through all resources, checks if they are available for 
@@ -1434,11 +1465,11 @@ sub print_resources {
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     if ($current_output=~/\\documentclass/) {
-	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
+	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}\\vskip 3 mm /;
     } else {
 	my $blankpages = '';
 	for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
-	$current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
+	$current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip -5 mm '.$current_output;
     }
     return ($current_output,$fullname);