--- loncom/interface/lonprintout.pm	2004/12/20 21:52:57	1.343
+++ loncom/interface/lonprintout.pm	2005/01/04 13:58:34	1.347
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.343 2004/12/20 21:52:57 albertel Exp $
+# $Id: lonprintout.pm,v 1.347 2005/01/04 13:58:34 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','10.2 in', '-0.57 in','-0.57 in','1 cm'],
-	     '2' => ['3.66 in','10.2 in', '-0.57 in','-0.57 in','1 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'],
@@ -703,7 +703,8 @@ sub print_latex_header {
     }
     $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
 	     '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
-	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}\usepackage{calc}'."\n".
+	     '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+	     '\usepackage{picins}\usepackage{calc}'."\n".
 	     '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
 	     '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
 	     '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
@@ -1103,7 +1104,9 @@ ENDPART
 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
 	}
 	&Apache::lonnet::delenv('form.counter');
-	if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}	
+	if ($flag_page_in_sequence eq 'YES') {
+	    $result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;
+	}	
 	$result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
 	      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
@@ -1705,6 +1708,7 @@ sub printHelper {
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='End Page' variable='FINISHPAGE' />
       </resource>
     </state>
 
@@ -1716,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
@@ -1737,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
@@ -1752,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">
@@ -1814,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">
@@ -1897,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">
@@ -1907,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