--- loncom/homework/optionresponse.pm	2002/05/03 19:32:57	1.39
+++ loncom/homework/optionresponse.pm	2002/07/29 20:43:47	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.39 2002/05/03 19:32:57 albertel Exp $
+# $Id: optionresponse.pm,v 1.44 2002/07/29 20:43:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,6 @@ sub start_optionresponse {
     my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
-#  if ($target eq 'tex') {$result .= '\begin{enumerate}';}
   return $result;
 }
 
@@ -74,16 +73,15 @@ sub end_optionresponse {
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-#  if ($target eq 'tex') {$result .= '\end{enumerate}';}
   return $result;
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup=();
 sub start_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
   my $result='';
-  %Apache::response::foilgroup={};
+  %Apache::response::foilgroup=();
   $Apache::optionresponse::conceptgroup=0;
   &Apache::response::setrandomnumber();
   if ($target eq 'edit') {
@@ -132,7 +130,7 @@ ENDTABLE
     if ($optchanged) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
-	$option=~s/\'/\\\'/;
+	$option=~s/\'/\\\'/g;
 	&Apache::lonxml::debug("adding option :$option:");
 	$result .="'".$option."',";
       }
@@ -140,7 +138,9 @@ ENDTABLE
       $result.=')">';
     } # else nothing changed so just use the default mechanism
   }
-  if ($target eq 'tex') {$result .= '\begin{enumerate}';}
+  if ($target eq 'tex') {
+      $result .= ' \begin{enumerate} ';
+  }
   return $result;
 }
 
@@ -281,8 +281,6 @@ sub displayfoils {
     foreach $name (@whichopt) {
       if ($target eq 'web') {
 	  $result.="<br />";
-      } elsif ($target eq 'tex') {
-	$result.='\newline';
       }
       $result .=$Apache::response::foilgroup{$name.'.value'}.
 	  ":".$Apache::response::foilgroup{$name.'.text'}."\n";
@@ -313,10 +311,13 @@ sub displayfoils {
 	      $durtyoptionlist =~ s/<option>/{\\bf /g;
 	      $durtyoptionlist =~ s/<\/option>/},/g;
 	      $durtyoptionlist =~ s/,$/\./g;
-	      $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
+	      $durtyoptionlist =~ s/>/\$>\$/g;
+	      $durtyoptionlist =~ s/</\$<\$/g;
+	      $durtyoptionlist =~ s/=/\$=\$/g;
+	      $result.= $durtyoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
 	      $Apache::optionresponse::displayoptionintex=1;
 	  } else {
-	      $result.= $Apache::response::foilgroup{$name.'.text'};
+	      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
 	  }
       } 
     }
@@ -333,7 +334,7 @@ sub displayfoils {
 sub start_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=1;
-  %Apache::response::conceptgroup={};
+  %Apache::response::conceptgroup=();
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
@@ -411,7 +412,6 @@ sub start_foil {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } 
-  if ($target eq 'tex') {$result .= '\item ';}
   return $result;
 }
 
@@ -437,7 +437,11 @@ sub end_foil {
 	$Apache::response::conceptgroup{"$name.text"} = $text;	
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
-	$Apache::response::foilgroup{"$name.value"} = $value;
+        if ($target eq 'tex') {
+	    $Apache::response::foilgroup{"$name.value"} = '\item '.$value;
+	} else {
+	    $Apache::response::foilgroup{"$name.value"} = $value;
+	}
 	$Apache::response::foilgroup{"$name.text"} = $text;
       }
     }