--- loncom/homework/caparesponse/caparesponse.pm	2003/05/09 22:00:16	1.96
+++ loncom/homework/caparesponse/caparesponse.pm	2003/05/13 15:27:45	1.98
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.96 2003/05/09 22:00:16 albertel Exp $
+# $Id: caparesponse.pm,v 1.98 2003/05/13 15:27:45 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,7 +165,10 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" || $ENV{'form.texaward'} eq '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,
@@ -315,7 +318,13 @@ sub end_numericalresponse {
 	    }
 	    if ($target eq 'answer') {
 		if ($high) { $ans.=' ['.$low.','.$high.']'; }
-		if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }
+		if ($sighigh) { 
+		    if ($ENV{'form.print_answer'} eq 'yes') {
+			$ans.= " Sig \\textit{$siglow - $sighigh}"; 
+		    } else {
+			$ans.= " Sig <i>$siglow - $sighigh</i>"; 
+		    }
+		}
 		$result.=&Apache::response::answer_part($$tagstack[-1],$ans);
 	    } elsif ($target eq 'analyze') {
 		push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);
@@ -327,8 +336,13 @@ sub end_numericalresponse {
 	}
 	if ($unit) {
 	    if ($target eq 'answer') {
-		$result.=&Apache::response::answer_part($$tagstack[-1],
-							"Unit: <b>$unit</b>");
+		if ($ENV{'form.print_answer'} eq 'yes') {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							    "Unit: \\verb|$unit|");
+		} else {
+		    $result.=&Apache::response::answer_part($$tagstack[-1],
+							    "Unit: <b>$unit</b>");
+		}
 	    } elsif ($target eq 'analyze') {
 		push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
 		      $unit);