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

sakharuk lon-capa-cvs@mail.lon-capa.org
Thu, 27 May 2004 14:08:59 -0000


sakharuk		Thu May 27 10:08:59 2004 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  First part of Bug 2812 (A4 is not printing correctly) is fixed. I readjust the size of output for 'book' layout only and will do this for 'album' as well.
  I've added a papertype argument to cgi file for the future use in printout.pl
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.302 loncom/interface/lonprintout.pm:1.303
--- loncom/interface/lonprintout.pm:1.302	Wed May 12 15:04:00 2004
+++ loncom/interface/lonprintout.pm	Thu May 27 10:08:58 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.302 2004/05/12 19:04:00 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.303 2004/05/27 14:08:58 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -421,13 +421,13 @@
     } elsif($papersize eq '6') {
 	if ($layout eq 'book') {
 	    if ($numberofcolumns == 1) {
-		$textwidth = '18 cm';
-		$textheight = '28 cm';
+		$textwidth = '176 mm';
+		$textheight = '254 mm';
 		$oddoffset = '-0.57 in';
 		$evenoffset = '-0.57 in';
 	    } elsif ($numberofcolumns == 2) {
-		$textwidth = '96 mm';
-		$textheight = '2 cm';
+		$textwidth = '91 mm';
+		$textheight = '254 mm';
 		$oddoffset = '-0.57 in';
 		$evenoffset = '-0.57 in';
 	    }
@@ -1231,6 +1231,7 @@
     &Apache::lonnet::appenv('cgi.'.$identifier.'.file'   => $filename,
                             'cgi.'.$identifier.'.layout'  => $laystyle,
                             'cgi.'.$identifier.'.numcol'  => $numberofcolumns,
+			    'cgi.'.$identifier.'.paper'  => $papersize,
                             'cgi.'.$identifier.'.selection' => $selectionmade,
 			    'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
 			    'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},