--- loncom/interface/lonprintout.pm	2003/05/12 18:47:07	1.162
+++ loncom/interface/lonprintout.pm	2003/05/13 15:28:32	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.162 2003/05/12 18:47:07 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.164 2003/05/13 15:28:32 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1381,6 +1381,18 @@ ENDPART
 	    &Apache::lonnet::appenv(%moreenv);
 	    my $texversion=&Apache::lonnet::ssi($currentURL);
 	    &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
+	    if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+		$moreenv{'form.grade_target'}='answer';
+		$moreenv{'form.print_answer'}='yes';
+		&Apache::lonnet::appenv(%moreenv);
+		my $answer=&Apache::lonnet::ssi($currentURL);
+		&Apache::lonnet::delenv('form.grade_target','form.print_answer');
+		my $start=index($answer,'\vskip 0 mm',0);
+		my $finish=rindex $answer,'\vskip 0 mm' ;
+		if ($start!=-1 && $finish!=-1) {$answer=substr($answer,$start,$finish-$start+12);}
+#		$r->print('<pre>'.$answer.'</pre>'); return OK;
+		$texversion=~s/(\\end{document})/$answer$1/;
+	    }
 	    $result .= $texversion;
 	    if ($currentURL=~m/\.page\s*$/) {
 		($result,$number_of_columns) = &page_cleanup($result);
@@ -1587,7 +1599,7 @@ sub handler {
 	foreach $key (keys %{$helper->{'VARS'}}) {
 	    $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
 	}
-	return OK;
+#	return OK;
 	
 	
 	&output_data_new($r,$helper);
@@ -1893,8 +1905,8 @@ CHOOSE_FROM_SUBDIR
 	$paramHash->{'variable'} = 'ANSWER_TYPE';   
 	$helper->declareVar('ANSWER_TYPE');         
         $paramHash->{CHOICES} = [
-                                   ['Print without answer', '1'],
-                                   ['Print with answers', '0'] ];
+                                   ['Print without answer', 'yes'],
+                                   ['Print with answers', 'no'] ];
         Apache::lonhelper::choices->new();
     }