--- loncom/interface/lonprintout.pm 2004/07/15 16:00:16 1.316
+++ loncom/interface/lonprintout.pm 2004/08/13 17:14:48 1.322
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.316 2004/07/15 16:00:16 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.322 2004/08/13 17:14:48 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -415,21 +415,79 @@ sub page_format {
$topmargin = '3.5 in';
}
}
-# } elsif($papersize eq '1') {
-# } elsif($papersize eq '2') {
+ } elsif($papersize eq '1') {
+ if ($layout eq 'book') {
+ if ($numberofcolumns == 1) {
+ $textwidth = '7.1 in';
+ $textheight = '13 in';
+ $oddoffset = '-0.57 in';
+ $evenoffset = '-0.57 in';
+ $topmargin = '-0.5 in';
+ } elsif ($numberofcolumns == 2) {
+ $textwidth = '3.66 in';
+ $textheight = '13 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 '2') {
+ if ($layout eq 'book') {
+ if ($numberofcolumns == 1) {
+ $textwidth = '7.1 in';
+ $textheight = '15 in';
+ $oddoffset = '-0.57 in';
+ $evenoffset = '-0.57 in';
+ $topmargin = '-0.5 in';
+ } elsif ($numberofcolumns == 2) {
+ $textwidth = '4.9 in';
+ $textheight = '16 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 '3'/) {
} elsif($papersize eq '6') {
if ($layout eq 'book') {
if ($numberofcolumns == 1) {
$textwidth = '176 mm';
- $textheight = '254 mm';
+ $textheight = '272 mm';
$oddoffset = '-0.57 in';
$evenoffset = '-0.57 in';
+ $topmargin = '-0.5 in';
} elsif ($numberofcolumns == 2) {
$textwidth = '91 mm';
- $textheight = '254 mm';
+ $textheight = '272 mm';
$oddoffset = '-0.57 in';
$evenoffset = '-0.57 in';
+ $topmargin = '-0.5 in';
}
} elsif ($layout eq 'album') {
if ($numberofcolumns eq '1') {
@@ -483,15 +541,19 @@ sub page_format_transformation {
my $name = &get_name();
my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+ my $topmargintoinsert = '';
+ if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
if ($layout eq 'album') {
- my $topmargintoinsert = '';
- if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
$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} /;
} elsif ($layout eq 'book') {
+
if ($choice ne 'All class print') {
- $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\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}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\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\\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 /;
+ $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') {
+ $text =~ s/(\\begin{document})/$1\\special{papersize=210mm,297mm}/;
}
}
if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
@@ -1037,7 +1099,7 @@ ENDPART
$moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
$moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
my $student_counter=-1;
foreach my $person (@students) {
my $duefile="/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
@@ -1263,7 +1325,9 @@ ENDPART
'cgi.'.$identifier.'backref' => $URLback,);
$r->print(<
+Continue