--- loncom/homework/radiobuttonresponse.pm	2002/07/17 18:06:18	1.42
+++ loncom/homework/radiobuttonresponse.pm	2002/08/05 15:55:21	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.42 2002/07/17 18:06:18 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.45 2002/08/05 15:55:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,9 +74,9 @@ sub end_radiobuttonresponse {
   return $result;
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
 sub start_foilgroup {
-  %Apache::response::foilgroup={};
+  %Apache::response::foilgroup=();
   $Apache::radiobuttonresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
   return '';
@@ -184,13 +184,27 @@ sub displayallfoils {
   my $part=$Apache::inputtags::part;
   my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
   my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
-  &Apache::lonhomework::showhash(%lastresponse);
-  foreach my $name (@names) {
-    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-      $result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
-      if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
-      $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
-      $temp++;
+  if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
+    foreach my $name (@names) {
+      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+	$result.="<br />".$Apache::response::foilgroup{$name.'.value'};
+	if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  $result.='<b>';
+	}
+	$result .= $Apache::response::foilgroup{$name.'.text'};
+	if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	  $result.='</b>';
+	}
+      }
+    }
+  } else {
+    foreach my $name (@names) {
+      if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
+	$result.="<br /><input type=\"radio\" name=\"HWVAL$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+	if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
+	$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+	$temp++;
+      }
     }
   }
   return $result;
@@ -242,17 +256,22 @@ sub displayfoils {
   my $result;
 
   my @whichfoils=&whichfoils($max,$answer);
-  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
+  if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach my $name (@whichfoils) {
       if ($target ne 'tex') {
 	  $result.="<br />";
+      } else {
+	  $result.='\vskip 0 mm ';
       }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
-	$result.='Correct';
+	$result.='Correct:<b>';
       } else {
-	$result.='Incorrect';
+	$result.='Incorrect:';
+      }
+      $result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n";
+      if ($Apache::response::foilgroup{$name.'.value'} eq 'true') {
+	$result.='</b>';
       }
-      $result.=":".$Apache::response::foilgroup{$name.'.text'}."</input>\n";
     }
   } else {
     my $temp=0;
@@ -266,12 +285,12 @@ sub displayfoils {
 	  if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 	  $result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n";
       } else {
-	  $result .= $Apache::response::foilgroup{$name.'.text'};
+	  $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
       }
       $temp++;
     }
   }
-  if ($target ne 'tex') { $result.="<br />"; }
+  if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; }
   return $result;
 }
 
@@ -290,7 +309,7 @@ sub displayanswers {
 sub start_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=1;
-  %Apache::response::conceptgroup={};
+  %Apache::response::conceptgroup=();
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
@@ -336,9 +355,6 @@ sub start_foil {
   my $result='';
   if ($target eq 'web' || $target eq 'tex') {
     &Apache::lonxml::startredirection;
-    if ($target eq 'tex') {
-	$result .= '\item ';
-    }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);