--- loncom/interface/lonprintout.pm	2010/06/10 16:14:34	1.581
+++ loncom/interface/lonprintout.pm	2010/07/13 00:16:28	1.582
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.581 2010/06/10 16:14:34 bisitz Exp $
+# $Id: lonprintout.pm,v 1.582 2010/07/13 00:16:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1560,7 +1560,9 @@ sub print_page_in_course {
 	my $title=&Apache::lonnet::gettitle($symb);
 	$title = &Apache::lonxml::latex_special_symbols($title);
     } else {
-	$result.=$currentURL;
+        my $esc_currentURL= $currentURL;
+        $esc_currentURL =~ s/_/\\_/g;
+	$result.=$esc_currentURL;
     }
     $result .= '\\\\';
 
@@ -1590,7 +1592,7 @@ sub print_page_in_course {
 	}
 	# these resources go through the XML transformer:
 
-	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/)  {		
+	elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/)  {		
 	    my $urlp = &Apache::lonnet::clutter($resource_src);
 	    my %form;
 	    my %moreenv;
@@ -2130,7 +2132,6 @@ ENDPART
 	&Apache::lonnet::delenv('construct.style');
     }
 
-
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
@@ -2300,9 +2301,9 @@ ENDPART
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
 	     ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') 
-	     ) { 
-
+	     ) {
 
+ 
         #-- produce an output string
 	if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')  or
 	    ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {
@@ -2365,7 +2366,13 @@ ENDPART
 		&Apache::lonxml::remember_problem_counter();
 		if ($flag_latex_header_remove eq 'NO') {
 		    $texversion.=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  # RF
-		    $flag_latex_header_remove = 'YES';
+                    unless (($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') ||
+                            (($i==0) &&
+                             (($urlp=~/\.page$/) ||
+                              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ||
+                              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page')))) {
+                        $flag_latex_header_remove = 'YES';
+                    }
 		}
 		$texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
 		if ($urlp=~/\.page$/) {
@@ -2373,7 +2380,7 @@ ENDPART
 		    if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
 		    $texversion =~ s/\\end{document}\d*/\\end{document}/;
 		    $flag_page_in_sequence = 'YES';
-		} 
+		}
 
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		   ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
@@ -2385,13 +2392,22 @@ ENDPART
 
 		    &Apache::lonxml::restore_problem_counter();
 		    my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
-
+                    if ($urlp =~ /\.page$/) {
+                        $answer =~ s/\\end{document}(\d*)$//;
+                    }
 		    if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
-			$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                        if ($urlp =~ /\.page$/) {
+                            my @probs = split(/\\keephidden{ENDOFPROBLEM}/,$texversion);
+                            my $lastprob = pop(@probs);
+                            $texversion = join('\keephidden{ENDOFPROBLEM}',@probs).
+                            $answer.'\keephidden{ENDOFPROBLEM}'.$lastprob;
+                        } else {
+                            $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+                        }
 		    } else {
-			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+			if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/) {
 			    $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $texversion =~ s/\\begin{document}//;
+#			    $texversion =~ s/\\begin{document}//; # FIXME
 			    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 ';
@@ -2484,7 +2500,7 @@ ENDPART
 		}
 		$result .= $texversion;
 		$flag_latex_header_remove = 'YES';   
-	    }	    
+	    }
 	    if (&Apache::loncommon::connection_aborted($r)) { 
 		last; 
 	    }
@@ -2960,7 +2976,7 @@ sub print_resources {
 	$i++;
 
 	if ( !($type eq 'problems' && 
-	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
+	       ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) ) {
 	    my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
 	    if (&Apache::lonnet::allowed('bre',$res_url)) {
 		if ($res_url!~m|^ext/|
@@ -2969,6 +2985,18 @@ sub print_resources {
 		    &Apache::lonxml::remember_problem_counter();    
 
 		    my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+                    if ($res_url =~ /\.page$/) {
+                        if ($remove_latex_header eq 'NO') {
+                            if (!($rendered =~ /\\begin\{document\}/)) {
+                                $rendered = &print_latex_header().$rendered;
+                            }
+                        }
+                        if ($remove_latex_header eq 'YES') {
+                            $rendered = &latex_header_footer_remove($rendered);
+                        } else {
+                            $rendered =~ s/\\end{document}\d*//;
+                        }
+                    }
 		    if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
 		       ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
 			#   Use a copy of the hash so we don't pervert it on future loop passes.
@@ -2986,7 +3014,9 @@ sub print_resources {
 
 			    
 			    my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
-			    $header =~ s/\\begin{document}//;     #<<<<<
+                            unless ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only') {
+                                $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 ';