--- loncom/interface/lonprintout.pm	2009/04/17 10:08:42	1.550
+++ loncom/interface/lonprintout.pm	2009/06/02 12:20:14	1.554
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.550 2009/04/17 10:08:42 foxr Exp $
+# $Id: lonprintout.pm,v 1.554 2009/06/02 12:20:14 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -163,7 +163,7 @@ sub include_pdf {
     $base =~ s/ /\_/g;
 
 
-    my $output = &print_latex_header()."\\begin{document}\n";
+    my $output = &print_latex_header();
     $output    .= '\special{ps: _begin_job_ ('
 	.$base.'.pdf.eps'.
 	')run _end_job_}';
@@ -1474,7 +1474,18 @@ sub print_construction_sequence {
 	    }
 	}
 	elsif ($urlp =~ /\.pdf$/i) {
-	    $result .= &include_pdf($urlp);
+	    my $texversion;
+	    if ($member != 0) {
+		$texversion .= '\cleardoublepage';
+	    }
+
+	    $texversion .= &include_pdf($urlp);
+	    $texversion = &latex_header_footer_remove($texversion);
+	    if ($member != $#order) {
+		$texversion .= '\\ \cleardoublepage';
+	    }
+	    
+	    $result .= $texversion;
 	}
     }
     if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
@@ -1692,7 +1703,7 @@ ENDPART
 		 && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
             #printing content of sequence from the construction space	
 	    $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
-	    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+#	    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
 	    $result .= &print_construction_sequence($currentURL, $helper, %form,
 						    $LaTeXwidth);
 	    $result .= '\end{document}';  
@@ -1725,6 +1736,7 @@ ENDPART
 
 	} elsif ($cleanURL =~ /\.pdf$/i) {
 	    $result .= &include_pdf($cleanURL);
+	    $result .= '\end{document}';
 	} else {
 	    $result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
 				  $helper->{'VARS'}->{'symb'});
@@ -1818,6 +1830,7 @@ ENDPART
 		    } else {
 			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+			    $texversion =~ s/\\begin{document}//;
 			    my $title = &Apache::lonnet::gettitle($master_seq[$i]);
 			    $title = &Apache::lonxml::latex_special_symbols($title);
 			    my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
@@ -1853,6 +1866,7 @@ ENDPART
 							  $assignment, 
 							  $courseidinfo, 
 							  $name);
+
 		    if ($numberofcolumns eq '1') {
 			$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
 		    } else {
@@ -1962,7 +1976,7 @@ ENDPART
 	 my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
 
 	 #loop over students
-	 my $flag_latex_header_remove = 'NO'; 
+	 my $flag_latex_header_remove = 'NO';
 	 my %moreenv;
          $moreenv{'instructor_comments'}='hide';
 	 $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
@@ -2292,7 +2306,7 @@ ENDPART
     # If there's been an unrecoverable SSI error, report it to the user
     if ($ssi_error) {
         my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
-        $r->print('<br /><h2>'.&mt('An unrecoverable network error occurred:').'</h2><p>  '.
+        $r->print('<br /><p class="LC_error">'.&mt('An unrecoverable network error occurred:').'</p><p>'.
                   &mt('At least one of the resources you chose to print could not be rendered due to an unrecoverable error when communicating with a server:').
                   '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
                   '</p><p>'.&mt('You can continue using the link provided below, but make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
@@ -2399,6 +2413,7 @@ sub print_resources {
 
 			    
 			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+			    $header =~ s/\\begin{document}//;     #<<<<<
 			    my $title = &Apache::lonnet::gettitle($curresline);
 			    $title = &Apache::lonxml::latex_special_symbols($title);
 			    my $body   ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
@@ -2434,7 +2449,13 @@ sub print_resources {
 			$rendered =~ s/\\end{document}//;
 		    }
 		    $current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
-
+		} elsif($res_url = ~/\.pdf$/) {
+		    my $url = &Apache::lonnet::clutter($res_url);
+		    my $rendered  = &include_pdf($url);
+		    if ($remove_latex_header ne 'NO') {
+			$rendered = &latex_header_footer_remove($rendered);
+		    }
+		    $current_output .= $rendered;
 		} else {
 		    my $rendered = &unsupported($res_url,$helper->{'VARS'}->{'LATEX_TYPE'},$curresline);
 		    if ($remove_latex_header ne 'NO') {
@@ -2449,6 +2470,8 @@ sub print_resources {
 	} 
 	if (&Apache::loncommon::connection_aborted($r)) { last; }
     }
+
+
     my $courseidinfo = &get_course();
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $header_line =
@@ -2457,7 +2480,6 @@ sub print_resources {
     my $header_start = ($columns_in_format == 1) ? '\lhead'
 	                                         : '\fancyhead[LO]';
     $header_line = $header_start.'{'.$header_line.'}';
-
     if ($current_output=~/\\documentclass/) {
 	$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
     } else {
@@ -3528,9 +3550,9 @@ sub render {
     my $i;
     for ($i = 1; $i <= $maxColumns; $i++) {
         if ($i == 2) {
-            $result .= "<option value='$i' selected>$i</option>\n";
+            $result .= '<option value="'.$i.'" selected="selected">'.$i.'</option>'."\n";
         } else {
-            $result .= "<option value='$i'>$i</option>\n";
+            $result .= '<option value="'.$i.'">'.$i.'</option>'."\n";
         }
     }
 
@@ -3546,9 +3568,9 @@ sub render {
 	$_=~/(\w+)/;
 	my $papersize=$1;
         if ($paperSize[$i]=~/$DefaultPaperSize/) {
-            $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
+            $result .= '<option selected="selected" value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
         } else {
-            $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
+            $result .= '<option value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
         }
         $i++;
     }
@@ -3557,8 +3579,8 @@ sub render {
     </td>
     <td align='center'>
         <select name='${var}.pdfFormFields'>
-            <option selected value='no'>$without</option>
-            <option value='yes'>$with</option>
+            <option selected="selected" value="no">$without</option>
+            <option value="yes">$with</option>
         </select>
     </td>
 HTML