--- loncom/interface/lonprintout.pm	2005/02/09 19:53:55	1.343.2.3
+++ loncom/interface/lonprintout.pm	2005/01/04 14:01:21	1.348
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.343.2.3 2005/02/09 19:53:55 albertel Exp $
+# $Id: lonprintout.pm,v 1.348 2005/01/04 14:01:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -432,8 +432,8 @@ sub character_chart {
 my %page_formats=
     ('letter' => {
 	 'book' => {
-	     '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm'],
-	     '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
+	     '1' => [ '7.1 in','10.0 in', '-0.57 in','-0.57 in','1 cm'],
+	     '2' => ['3.66 in','10.0 in', '-0.57 in','-0.57 in','1 cm']
 	 },
 	 'album' => {
 	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],
@@ -698,7 +698,7 @@ sub IndexCreation {
 sub print_latex_header {
     my $mode=shift;
     my $output='\documentclass[letterpaper]{article}';
-    if ($mode eq 'batchmode' || !$ENV{'request.role.adv'}) {
+    if ($mode eq 'batchmode') {
 	$output.='\batchmode';
     }
     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
@@ -1708,6 +1708,7 @@ sub printHelper {
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
       </resource>
     </state>
 
@@ -1719,6 +1720,7 @@ sub printHelper {
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
       </resource>
     </state>
 HELPERFRAGMENT
@@ -1740,6 +1742,7 @@ HELPERFRAGMENT
       <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
     </resource>
   </state>
 ALL_PROBLEMS
@@ -1755,6 +1758,7 @@ ALL_PROBLEMS
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
       </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
@@ -1817,6 +1821,7 @@ CHOOSE_ANON1
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
       </resource>
     <message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
     <choices variable="EMPTY_PAGES">
@@ -1900,6 +1905,7 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
       </resource>
     </state>
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
@@ -1910,6 +1916,7 @@ CHOOSE_FROM_SUBDIR
       <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
       </resource>
     </state>
 CHOOSE_FROM_ANY_SEQUENCE