--- loncom/homework/optionresponse.pm	2002/07/29 20:43:47	1.44
+++ loncom/homework/optionresponse.pm	2002/08/26 18:15:22	1.46
@@ -1,7 +1,7 @@
-# The LearningOnline Network with CAPA
+# LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.44 2002/07/29 20:43:47 albertel Exp $
+# $Id: optionresponse.pm,v 1.46 2002/08/26 18:15:22 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -273,7 +273,7 @@ sub displayfoils {
   my @falselist;
   my $result;
   my $name;
-  $Apache::optionresponse::displayoptionintex=0;
+  my $displayoptionintex=0;
   my @whichopt = &whichfoils($max);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-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;
@@ -305,19 +312,28 @@ sub displayfoils {
 		  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
 	  $temp++;
       } else {
-	  if ($Apache::optionresponse::displayoptionintex == 0) {
-              my $durtyoptionlist = $optionlist;
-	      $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
-	      $durtyoptionlist =~ s/<option>/{\\bf /g;
-	      $durtyoptionlist =~ s/<\/option>/},/g;
-	      $durtyoptionlist =~ s/,$/\./g;
-	      $durtyoptionlist =~ s/>/\$>\$/g;
-	      $durtyoptionlist =~ s/</\$<\$/g;
-	      $durtyoptionlist =~ s/=/\$=\$/g;
-	      $result.= $durtyoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
-	      $Apache::optionresponse::displayoptionintex=1;
+	  if ($displayoptionintex == 0) {
+              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;
+	      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'};
+	      }
 	  }
       } 
     }
@@ -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;
       }
     }
   }