[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 19 Aug 2004 01:23:33 -0000
albertel Wed Aug 18 21:23:33 2004 EDT
Modified files:
/loncom/interface lonprintout.pm
Log:
- I think this is more readable
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.326 loncom/interface/lonprintout.pm:1.327
--- loncom/interface/lonprintout.pm:1.326 Wed Aug 18 14:56:46 2004
+++ loncom/interface/lonprintout.pm Wed Aug 18 21:23:32 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.326 2004/08/18 18:56:46 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.327 2004/08/19 01:23:32 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -373,6 +373,100 @@
}
+ #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 {
#
#Supported paper format: "Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]",
@@ -382,135 +476,7 @@
# "A6 [105x148 mm]"
#
my ($papersize,$layout,$numberofcolumns) = @_;
- my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);
- my $page_formats={'book'=>{
- '1'=>{'letter'=>{'width'=>'7.1 in','height'=>'10.2 in','topmargin'=>'0 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
- },
- 'legal'=>{'width'=>'7.1 in','height'=>'13 in','topmargin'=>'-0.5 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
- },
- 'tabloid'=>{'width'=>'9.8 in','height'=>'16 in','topmargin'=>'-0.5 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
- },
- 'exacutive'=>{'width'=>'6.8 in','height'=>'9 in','topmargin'=>'1.2 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
- },
- 'a2'=>{
-
- },
- 'a3'=>{
-
- },
- 'a4'=>{'width'=>'176 mm','height'=>'272 mm','topmargin'=>'-0.5 in',
- 'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',
-
- },
- 'a5'=>{
-
- },
- 'a6'=>{
-
- },
- },
- '2'=>{'letter'=>{'width'=>'3.66 in','height'=>'10.2 in','topmargin'=>'0 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
- },
- 'legal'=>{'width'=>'3.16 in','height'=>'13 in','topmargin'=>'-0.5 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
- },
- 'tabloid'=>{'width'=>'4.9 in','height'=>'16 in','topmargin'=>'-0.5 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
-
- },
- 'exacutive'=>{'width'=>'3.1 in','height'=>'9 in','topmargin'=>'1.2 in',
- 'oddsidemargin'=>'-0.57 in','evensidemargin'=>'-0.57 in',
- },
- 'a2'=>{
-
- },
- 'a3'=>{
-
- },
- 'a4'=>{'width'=>'91 mm','height'=>'272 mm','topmargin'=>'-0.5 in',
- 'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',
-
- },
- 'a5'=>{
-
- },
- 'a6'=>{
-
- },
-
- },
- },'album'=>{
- '1'=>{'letter'=>{'width'=>'8.8 in','height'=>'6.8 in','topmargin'=>'0 in',
- 'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',
- },
- 'legal'=>{
-
- },
- 'tabloid'=>{
-
- },
- 'exacutive'=>{
-
- },
- 'a2'=>{
-
- },
- 'a3'=>{
-
- },
- 'a4'=>{'width'=>'8.5 in','height'=>'7.7 in','topmargin'=>'0 in',
- 'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',
-
- },
- 'a5'=>{
-
- },
- 'a6'=>{
-
- },
- },
- '2'=>{'letter'=>{'width'=>'4.4 in','height'=>'6.8 in','topmargin'=>'3.5 in',
- 'oddsidemargin'=>'-0.5 in','evensidemargin'=>'-1.5 in',
- },
- 'legal'=>{
-
- },
- 'tabloid'=>{
-
- },
- 'exacutive'=>{
-
- },
- 'a2'=>{
-
- },
- 'a3'=>{
-
- },
- 'a4'=>{'width'=>'3.9 in','height'=>'7.7 in','topmargin'=>'0 in',
- 'oddsidemargin'=>'-40 pt in','evensidemargin'=>'-60 pt',
-
- },
- 'a5'=>{
-
- },
- 'a6'=>{
-
- },
-
- },
- },
- };
- return $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'width'},
- $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'height'},
- $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'oddmargin'},
- $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'evensidemargin'},
- $page_formats->{$layout}->{$numberofcolumns}->{$papersize}->{'topmargin'};
+ return @{$page_formats{$papersize}->{$layout}->{$numberofcolumns}};
}
@@ -1320,9 +1286,6 @@
}
}
- &Apache::lonnet::logthis("SSSSSSS: $filename,$laystyle,$papersize,$numberofcolumns,$selectionmade,$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$ENV{'request.role.adv'},$#print_array,$student_names,$URLback");
-
-
&Apache::lonnet::appenv('cgi.'.$identifier.'.file' => $filename,
'cgi.'.$identifier.'.layout' => $laystyle,
'cgi.'.$identifier.'.numcol' => $numberofcolumns,
@@ -2043,7 +2006,7 @@
my $maxColumns = 2;
my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
- "tabloid (ladger) [11x17 in]", "executive [7 1/2x10 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]" );