--- loncom/homework/radiobuttonresponse.pm	2004/03/15 22:09:52	1.86
+++ loncom/homework/radiobuttonresponse.pm	2004/05/27 04:25:13	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.86 2004/03/15 22:09:52 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.89 2004/05/27 04:25:13 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') {
@@ -104,7 +106,7 @@ sub start_foilgroup {
     my $result;
     %Apache::response::foilgroup=();
     $Apache::radiobuttonresponse::conceptgroup=0;
-    &Apache::response::setrandomnumber();
+    &Apache::response::pushrandomnumber();
     if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
 	$result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     }
@@ -195,6 +197,7 @@ sub end_foilgroup {
 	    }
 	}
     }
+    &Apache::response::poprandomnumber();
     &Apache::lonxml::increment_counter();
     return $result;
 }
@@ -283,7 +286,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 +312,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