--- loncom/homework/optionresponse.pm	2003/10/15 19:51:29	1.84.2.2
+++ loncom/homework/optionresponse.pm	2003/10/24 17:56:42	1.91
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.84.2.2 2003/10/15 19:51:29 albertel Exp $
+# $Id: optionresponse.pm,v 1.91 2003/10/24 17:56:42 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -246,7 +246,7 @@ sub end_foilgroup {
 	}
       }
     }
-    &Apache::lonxml::increment_counter(&getfoilcounts($max));
+    if ($target ne 'answer') {&Apache::lonxml::increment_counter(&getfoilcounts($max));}
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
   }
@@ -302,7 +302,6 @@ sub displayfoils {
   my $id=$Apache::inputtags::response[-1];
   my $break;
   my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
-  my $status=$Apache::inputtags::status[-1];
   if ( ($target ne 'tex') &&
        &Apache::response::show_answer() ) {
     my $temp=1;
@@ -441,7 +440,7 @@ sub optionlist_correction {
 
     my $texoptionlist = shift;
     if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {
-	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choose from: /;
+	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;
 	$texoptionlist =~ s/<option>/\{\\bf /g;
 	$texoptionlist =~ s/<option selected="on">/\{\\bf /g;
 	$texoptionlist =~ s/<\/option>/\},/g;
@@ -612,7 +611,7 @@ sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';
   my $result = '';
-  if ($target eq 'web' || $target eq 'tex') { 
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
       $text=&Apache::lonxml::endredirection;
       if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
   }
@@ -632,11 +631,7 @@ sub end_foil {
 	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
 	    $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
 	} else {
-	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
-	    } else {
-		$Apache::response::conceptgroup{"$name.text"} = $text;
-	    }
+	    $Apache::response::conceptgroup{"$name.text"} = $text;
 	}
 	$Apache::response::conceptgroup{"$name.location"} = $location;
       } else {
@@ -645,11 +640,7 @@ sub end_foil {
 	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
 	    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
 	} else {
-	    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-		$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
-	    } else {
-		$Apache::response::foilgroup{"$name.text"} = $text;
-	    }
+	    $Apache::response::foilgroup{"$name.text"} = $text;
 	}
 	$Apache::response::foilgroup{"$name.location"} = $location;
       }