--- loncom/interface/lonprintout.pm	2003/05/14 17:33:59	1.169
+++ loncom/interface/lonprintout.pm	2003/05/15 13:32:02	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.169 2003/05/14 17:33:59 albertel Exp $
+# $Id: lonprintout.pm,v 1.173 2003/05/15 13:32:02 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1387,8 +1387,7 @@ ENDPART
 		$form{'answer_output_mode'}='tex';
 		$form{'rndseed'}=$rndseed;
 		my $answer=&Apache::lonnet::ssi($currentURL,%form);
-#		$r->print('<pre>'.$answer.'</pre>'); return OK;
-		$texversion=~s/(\\end{document})/$answer$1/;
+		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
 	    }
 	    $result .= $texversion;
 	    if ($currentURL=~m/\.page\s*$/) {
@@ -1420,7 +1419,7 @@ ENDPART
 	    } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
 		$selectionmade = 4;
 	    }
-	    my %form;
+	    my %form;	   
 	    $form{'grade_target'}='tex';
 	    $form{'textwidth'}=$LaTeXwidth;
 	    $form{'symb'}=$master_seq[$i];
@@ -1437,6 +1436,13 @@ ENDPART
 	    } else {
 		$texversion =~ s/\\end{document}//;
 	    }
+	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		my %form;
+		$form{'grade_target'}='answer';
+		$form{'answer_output_mode'}='tex';
+		my $answer=&Apache::lonnet::ssi($urlp,%form);
+		$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+	    }
 	    $result .= $texversion;         
 	    $flag_latex_header_remove = 'YES';   
 	}
@@ -1471,6 +1477,13 @@ ENDPART
 			} else {
 			    $rendered =~ s/\\end{document}//;
 			}
+			if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+			    my %form;
+			    $form{'answer_output_mode'}='tex';
+			    my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,
+										      $ENV{'request.course.id'},%form);
+			    $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
+			}
 			$current_output .= $rendered;
 		    }
 		    $flag_latex_header_remove = 'YES';
@@ -1829,7 +1842,7 @@ HELPERFRAGMENT
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <message>(mark them then click "next" button) <br /></message>
-    <resource variable="RESOURCES" multichoice="1">
+    <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
       <nextstate>PAGESIZE</nextstate>
       <filterfunc>return $isProblemOrMap</filterfunc>
       <choicefunc>return $isProblem</choicefunc>
@@ -1891,7 +1904,8 @@ CHOOSE_FROM_SUBDIR
     $paramHash->{CHOICES} = $printChoices;
     Apache::lonhelper::choices->new();
 
-    if ($ENV{'request.role.adv'}) {
+    if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or 
+	($helper->{VARS}->{'construction'} eq '1')) {
         $paramHash = Apache::lonhelper::getParamHash();
         $paramHash->{MESSAGE_TEXT} = "<br /><big><b><i>Next option is available only for advanced users:</i></b></big><br />";
         Apache::lonhelper::message->new();