--- loncom/homework/optionresponse.pm	2002/04/25 21:35:30	1.38
+++ loncom/homework/optionresponse.pm	2002/07/16 21:02:29	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.38 2002/04/25 21:35:30 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.42 2002/07/16 21:02:29 sakharuk 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,7 +73,6 @@ 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;
 }
 
@@ -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,13 @@ 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} ';
+      my $option_list = &Apache::lonxml::get_param('options',$parstack,$safeeval);
+      $option_list =~ s/^\(//;
+      $option_list =~ s/\)$//;
+      $result .= ' \item[] Use the following options: \textbf{'.$option_list.'}. ';
+  }
   return $result;
 }
 
@@ -229,6 +233,7 @@ sub getfoilcounts {
   my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
   # +1 since instructors will count from 1
   my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
+  if (&Apache::response::showallfoils()) { $max=$count; }
   return ($count,$max);
 }
 
@@ -238,7 +243,12 @@ sub whichfoils {
   my @whichopt =();
   while ((($#whichopt+1) < $max) && ($#names > -1)) {
     &Apache::lonxml::debug("Have $#whichopt max is $max");
-    my $aopt=int(rand($#names+1));
+    my $aopt;
+    if (&Apache::response::showallfoils()) {
+      $aopt=0;
+    } else {
+      $aopt=int(rand($#names+1));
+    }
     &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");
@@ -275,8 +285,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";
@@ -307,6 +315,9 @@ sub displayfoils {
 	      $durtyoptionlist =~ s/<option>/{\\bf /g;
 	      $durtyoptionlist =~ s/<\/option>/},/g;
 	      $durtyoptionlist =~ s/,$/\./g;
+	      $durtyoptionlist =~ s/>/\$>\$/g;
+	      $durtyoptionlist =~ s/</\$<\$/g;
+	      $durtyoptionlist =~ s/=/\$=\$/g;
 	      $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
 	      $Apache::optionresponse::displayoptionintex=1;
 	  } else {
@@ -405,7 +416,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;
 }
 
@@ -424,13 +434,18 @@ sub end_foil {
       &Apache::lonxml::debug("Got a name of :$name:");
       if (!$name) { $name=$Apache::lonxml::curdepth; }
       &Apache::lonxml::debug("Using a name of :$name:");
-      if ( $Apache::optionresponse::conceptgroup ) {
+      if ( $Apache::optionresponse::conceptgroup
+	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
 	$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;
       }
     }