--- loncom/interface/lonprintout.pm	2004/12/27 14:07:28	1.344
+++ loncom/interface/lonprintout.pm	2005/01/10 11:46:03	1.351
@@ -1,7 +1,7 @@
-# The LearningOnline Network
+#  The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.344 2004/12/27 14:07:28 foxr Exp $
+# $Id: lonprintout.pm,v 1.351 2005/01/10 11:46:03 foxr 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','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']
 	 },
 	 'album' => {
 	     '1' => [ '8.8 in', '6.8 in','-40 pt in',  '-60 pt','1 cm'],
@@ -1014,10 +1014,23 @@ ENDPART
 	my $flag_latex_header_remove = 'NO';
 	my $flag_page_in_sequence = 'NO';
 	my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+	my %page_breaks;
+	foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
+	    $page_breaks{$break} = 1;
+	}
 	my $prevassignment='';
 	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonxml::init_counter();
 	for (my $i=0;$i<=$#master_seq;$i++) {
+
+	    # Note due to document structure, not allowed to put \newpage
+	    # prior to the first resource
+
+	    if (defined $page_breaks{$master_seq[$i]}) {
+		if($i != 0) {
+		    $result.="\\newpage\n";
+		}
+	    }
 	    my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
 	    $urlp=&Apache::lonnet::clutter($urlp);
 	    $form{'symb'}=$master_seq[$i];
@@ -1135,6 +1148,7 @@ ENDPART
 	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
 	 }
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+
 	 #loop over students
 	 my $flag_latex_header_remove = 'NO'; 
 	 my %moreenv;
@@ -1145,6 +1159,7 @@ ENDPART
 	 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";
 	     if (-e $duefile) {
 		 my $temp_file = Apache::File->new('>>'.$duefile);
@@ -1411,11 +1426,22 @@ sub print_resources {
 	$namepostfix="\\\\Name: ";
 	$fullname = "CODE - ".$moreenv->{'CODE'};
     }
+    my %page_breaks;
+    foreach my $break (split /\|\|\|/,$helper->{'VARS'}->{'FINISHPAGE'}) {
+	$page_breaks{$break} = 1;
+    }
+    my $i           = 0;
     #goes through all resources, checks if they are available for 
     #current student, and produces output   
     &Apache::lonnet::delenv('form.counter');
     &Apache::lonxml::init_counter();
     foreach my $curresline (@{$master_seq})  {
+	if (defined $page_breaks{$curresline}) {
+	    if($i != 0) {
+		$current_output.= "\\newpage\n";
+	    }
+	}
+	$i++;
 	if ( !($type eq 'problems' && 
 	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
@@ -1527,6 +1553,9 @@ sub handler {
 #	}
 #	return OK;
 
+
+
+			 
     &output_data($r,$helper,\%parmhash);
     return OK;
 } 
@@ -1692,6 +1721,7 @@ sub printHelper {
 
     # If we're in a sequence...
     if (($helper->{'VARS'}->{'construction'} ne '1') &&
+
 	$helper->{VARS}->{'postdata'} &&
 	$helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence
@@ -1708,6 +1738,7 @@ sub printHelper {
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 
@@ -1719,6 +1750,7 @@ sub printHelper {
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 HELPERFRAGMENT
@@ -1730,6 +1762,7 @@ HELPERFRAGMENT
     # problems in the course, optionally for selected students
     if ($userPriviledged && 
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
+
         push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
@@ -1740,6 +1773,7 @@ HELPERFRAGMENT
       <filterfunc>return $isProblemOrMap;</filterfunc>
       <choicefunc>return $isNotMap;</choicefunc>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
     </resource>
   </state>
 ALL_PROBLEMS
@@ -1755,6 +1789,7 @@ ALL_PROBLEMS
       <filterfunc>return $isProblem;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='New 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 +1852,7 @@ CHOOSE_ANON1
       <filterfunc>return $isNotMap;</filterfunc>
       <mapurl>$map</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' 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 +1936,7 @@ CHOOSE_FROM_SUBDIR
       <nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
       <filterfunc>return \$res->is_sequence;</filterfunc>
       <valuefunc>return $urlValue;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
   <state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
@@ -1910,6 +1947,7 @@ CHOOSE_FROM_SUBDIR
       <filterfunc>return $isProblem</filterfunc>
       <mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
       <valuefunc>return $symbFilter;</valuefunc>
+      <option text='Newpage' variable='FINISHPAGE' />
       </resource>
     </state>
 CHOOSE_FROM_ANY_SEQUENCE