--- loncom/homework/caparesponse/caparesponse.pm	2003/09/23 01:52:57	1.107.2.1
+++ loncom/homework/caparesponse/caparesponse.pm	2003/08/21 17:33:22	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.107.2.1 2003/09/23 01:52:57 albertel Exp $
+# $Id: caparesponse.pm,v 1.108 2003/08/21 17:33:22 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -169,7 +169,10 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if (  &Apache::response::show_answer() ) {
+	if (   ($award =~ /^correct/
+                && lc($Apache::lonhomework::problemstatus) ne 'no')
+             || $status eq "SHOW_ANSWER"
+             || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
 	    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
 							 $safeeval);
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
@@ -363,7 +366,7 @@ sub end_numericalresponse {
 	    if ($target eq 'answer') {
 		if ($ENV{'form.answer_output_mode'} eq 'tex') {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
-							  "\\textbf{$string}");
+							  "$string");
 		} else {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
 							    "<b>$string</b>");