--- loncom/homework/optionresponse.pm	2002/08/05 15:55:39	1.45
+++ loncom/homework/optionresponse.pm	2002/09/26 20:45:00	1.47
@@ -1,7 +1,7 @@
-# The LearningOnline Network with CAPA
+# LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.45 2002/08/05 15:55:39 albertel Exp $
+# $Id: optionresponse.pm,v 1.47 2002/09/26 20:45:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -243,7 +243,7 @@ sub whichfoils {
     if (&Apache::response::showallfoils()) {
       $aopt=0;
     } else {
-      $aopt=int(rand($#names+1));
+      $aopt=int(&Math::Random::random_uniform() * ($#names+1));
     }
     &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);
@@ -281,9 +281,16 @@ sub displayfoils {
     foreach $name (@whichopt) {
       if ($target eq 'web') {
 	  $result.="<br />";
+      } elsif ($target eq 'tex') {
+	  $result.='\vskip 0 mm ';
+      }
+      if ($target ne 'tex') {
+	  $result .=$Apache::response::foilgroup{$name.'.value'}.
+	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
+      } else {
+ 	  $result .='\item '.$Apache::response::foilgroup{$name.'.value'}.
+	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
       }
-      $result .=$Apache::response::foilgroup{$name.'.value'}.
-	  ":".$Apache::response::foilgroup{$name.'.text'}."\n";
     }
   } else {
     my $temp=1;
@@ -309,15 +316,24 @@ sub displayfoils {
               my $texoptionlist = $optionlist;
 	      $texoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
 	      $texoptionlist =~ s/<option>/{\\bf /g;
+	      $texoptionlist =~ s/<option selected="on">/{\\bf /g;
 	      $texoptionlist =~ s/<\/option>/},/g;
 	      $texoptionlist =~ s/,$/\./g;
 	      $texoptionlist =~ s/>/\$>\$/g;
 	      $texoptionlist =~ s/</\$<\$/g;
 	      $texoptionlist =~ s/=/\$=\$/g;
-	      $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+		  $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
+	      } else {
+		  $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+	      }
 	      $displayoptionintex=1;
 	  } else {
-	      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
+		  $result.= $Apache::response::foilgroup{$name.'.text'};
+	      } else {
+		  $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
+	      }
 	  }
       } 
     }
@@ -357,7 +373,7 @@ sub end_conceptgroup {
     #if not there aren't any foils to display and thus no question
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
-      my $pick=int rand $#names+1;
+      my $pick=int(&Math::Random::random_uniform() * ($#names+1));
       my $name=$names[$pick];
       push @{ $Apache::response::foilgroup{'names'} }, $name;
       $Apache::response::foilgroup{"$name.value"} =
@@ -434,15 +450,15 @@ sub end_foil {
 	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
-	$Apache::response::conceptgroup{"$name.text"} = $text;	
+	$Apache::response::conceptgroup{"$name.text"} = $text;
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
         if ($target eq 'tex') {
-	    $Apache::response::foilgroup{"$name.value"} = '\item '.$value;
+	    $Apache::response::foilgroup{"$name.text"} = '\item '.$text;
 	} else {
 	    $Apache::response::foilgroup{"$name.value"} = $value;
+	    $Apache::response::foilgroup{"$name.text"} = $text;
 	}
-	$Apache::response::foilgroup{"$name.text"} = $text;
       }
     }
   }