--- loncom/homework/radiobuttonresponse.pm	2004/03/08 23:23:04	1.85
+++ loncom/homework/radiobuttonresponse.pm	2004/05/07 17:18:45	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.85 2004/03/08 23:23:04 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.88 2004/05/07 17:18:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -77,6 +77,8 @@ sub start_radiobuttonresponse {
 	    $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}';
 	} elsif ($type eq 'i') {
 	    $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';
+	} else {
+	    $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}';
 	}
 	$result .= '\begin{enumerate}';
     } elsif ($target eq 'analyze') {
@@ -283,7 +285,7 @@ sub whichfoils {
 		push (@whichfalse,$name);
 	    } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
 	    } else {
-		&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+		&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
 	    }
 	}
     } else {
@@ -309,7 +311,7 @@ sub whichfoils {
 		}
 	    } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'unused') {
 	    } else {
-		&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>"));
+		&Apache::lonxml::error(&HTML::Entities::encode("No valid value assigned ($Apache::response::foilgroup{$name.'.value'}) for foil $name in <foilgroup>",'<>&"'));
 	    }
 	}
 	#pick a true statement
@@ -547,6 +549,7 @@ sub end_foil {
 	    if (defined($Apache::response::foilnames{$name})) {
 		&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
 	    }
+	    $Apache::response::foilnames{$name}++;
 	    my $location =&Apache::lonxml::get_param('location',$parstack,
 						     $safeeval);
 	    if ( $Apache::radiobuttonresponse::conceptgroup