--- loncom/homework/optionresponse.pm	2004/02/13 21:01:11	1.100
+++ loncom/homework/optionresponse.pm	2005/06/22 12:03:23	1.129
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.100 2004/02/13 21:01:11 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.129 2005/06/22 12:03:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,9 @@
 #
 package Apache::optionresponse;
 use strict;
-use Apache::response;
+use Apache::response();
+use Apache::lonlocal;
+use Apache::lonnet;
 
 BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
@@ -37,10 +39,11 @@ sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   #when in a option response use these
-  &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+  &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   %Apache::hint::option=();
+  undef(%Apache::response::foilnames);
   if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).
 	"<tr><td>Multiple Option Response Question ".
@@ -54,10 +57,14 @@ sub start_optionresponse {
 				     $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order','randomize',
 				  ['yes','no'],$token).
+        &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
+				  [['horizontal',&mt('Normal list')],
+				   ['vertical',&mt('Listed in a vertical column')]],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						 $safeeval,'max','randomize');
+						 $safeeval,'max','randomize',
+						 'TeXlayout');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');
@@ -72,9 +79,10 @@ sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
-  &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
+  &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup','drawoptionlist'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+  undef(%Apache::response::foilnames);
   return $result;
 }
 
@@ -85,7 +93,7 @@ sub start_foilgroup {
   my $result='';
   %Apache::response::foilgroup=();
   $Apache::optionresponse::conceptgroup=0;
-  &Apache::response::setrandomnumber();
+  &Apache::response::pushrandomnumber();
   if ($target eq 'edit') {
     my $optionlist="<option></option>\n";
     my $option;
@@ -114,14 +122,14 @@ ENDTABLE
     my @options;
     my $optchanged=0;
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
-    if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
-      my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
+    if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
+      my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
       &Apache::lonxml::debug("Deleting :$delopt:");
       splice(@options,$delopt-1,1);
       $optchanged=1;
     }
-    if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
-      my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
+    if ($env{"form.$Apache::lonxml::curdepth.options"}) {
+      my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
       if ($options[0]) {
 	push(@options,$newopt);
       } else {
@@ -141,7 +149,8 @@ ENDTABLE
     } # else nothing changed so just use the default mechanism
   }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
-      $result .= ' \begin{enumerate} ';
+      $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
+                   \begin{enumerate} ';
   }
   return $result;
 }
@@ -156,13 +165,17 @@ sub end_foilgroup {
     my $name;
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    &Apache::lonxml::debug("options:".join(':',@opt));
+
+    my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
+					     -2,0);
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 					       $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {
-      $result.=&displayfoils($target,$max,$randomize,@opt);
+      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
     } elsif ( $target eq 'analyze') {
@@ -172,7 +185,7 @@ sub end_foilgroup {
 	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 	push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {
-      if ( defined $ENV{'form.submitted'}) {
+      if ( &Apache::response::submitted()) {
 	my @whichopt = &whichfoils($max,$randomize);
 	my $temp=1;my $name;
 	my %responsehash;
@@ -182,7 +195,7 @@ sub end_foilgroup {
 	my $ignored=0;
 	foreach $name (@whichopt) {
 	  my $response=&Apache::response::getresponse($temp);
-	  if ($ENV{'form.submitted'} eq 'scantron') {
+	  if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) {
 	      $response = $opt[$response];
 	  }
 	  if ( $response =~ /[^\s]/) {
@@ -210,7 +223,16 @@ sub end_foilgroup {
 	    $responsestr;
 	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
 	
-	if (!$Apache::lonhomework::scantronmode) {
+	if ($Apache::lonhomework::type eq 'survey') {
+	    if ($ignored == 0) {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    } elsif ($wrong==0 && $right==0) {
+	    } else {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    }
+	} elsif (!$Apache::lonhomework::scantronmode) {
 	    my $ad;
 	    if ($wrong==0 && $ignored==0) {
 		$ad='EXACT_ANS';
@@ -228,7 +250,11 @@ sub end_foilgroup {
 	} else {
 	    my $ad;
 	    if ($wrong==0 && $right==0) {
-		#nothing submitted
+		#nothing submitted only assign a score if we 
+		#need to override a previous grade
+		if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
+		    $ad='ASSIGNED_SCORE';
+		}
 	    } else {
 		$ad='ASSIGNED_SCORE';
 	    }
@@ -247,6 +273,7 @@ sub end_foilgroup {
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       $result .= '\end{enumerate}';
   }
+  &Apache::response::poprandomnumber();
   return $result;
 }
 
@@ -281,17 +308,39 @@ sub displayanswers {
   return $result;
 }
 
+sub check_for_invalid {
+    my ($names,$options) = @_;
+    my %bad_names;
+    foreach my $name (@{ $names }) {
+	my $value=$Apache::response::foilgroup{$name.'.value'};
+	my $found=0;
+	foreach my $option (@{ $options }) {
+	    if ($value eq $option) { $found=1; }
+	}
+	if (!$found) { $bad_names{$name}=$value; }
+    }
+    if (%bad_names) {
+	my $error=&mt('The question can not be gotten correct, '.
+	    'the following foils in the &lt;optionresponse&gt; '.
+	    'have invalid correct options').' <br /><tt>'.
+	    join('<br />',(map { $_=&mt("[_1] with value [_2]",$_,$bad_names{$_}) } (keys(%bad_names)))).
+	    "</tt>";
+	&Apache::lonxml::error($error);
+    }
+}
+
 sub displayfoils {
-  my ($target,$max,$randomize,@opt)=@_;
+  my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
   my @falselist;
   my $result;  
   my $name;
-  my $displayoptionintex=0;
+  my $displayoptionintex=1;
   my @alphabet = ('A'..'Z');
   my @whichopt = &whichfoils($max,$randomize);
+  &check_for_invalid(\@whichopt,\@opt);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
   my $break;
@@ -303,13 +352,7 @@ sub displayfoils {
 	my $text=$Apache::response::foilgroup{$name.'.text'};
 	my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
 	my $lastopt=$lastresponse{$name};
-	if ($text!~/^\s*$/) {
-	    if ($target eq 'tex') {
-		$break='\vskip 0 mm ';
-	    } elsif ($target eq 'web') {
-		$break='<br />';
-	    }
-	}
+	if ($text!~/^\s*$/) { $break='<br />'; }
 	$result.=$break;
 	if ($target eq 'web') {
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -317,24 +360,15 @@ sub displayfoils {
 		if ($text=~/^\s*$/) {
 		    $text=$value.$text;
 		} else {
-		    $text=$value.': '.$text;
+		    $text='<b>'.$value.':</b> '.$text;
 		}
 	    } else {
 		$text='&#149;'.$text;
 	    }
 	    $result.=$text."\n";
-      } elsif ($target eq 'tex') {
-	  $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
-	  if ($max>1) {$result .='\item ';}
- 	  $result .=' \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
-	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
-      }
+	}
       if ($Apache::lonhomework::type eq 'exam') {
-	if ($target ne 'tex') {
 	  $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
-        } else {
-	  $result.=&bubbles(\@alphabet,\@opt);
-        }
       }
       $temp++;
     }
@@ -353,76 +387,65 @@ sub displayfoils {
       }
       my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";
-      my $option;
-      foreach $option (@opt) {
-	if ($option eq $lastopt) {
-	  $optionlist.="<option selected=\"on\">$option</option>\n";
-	} else {
-	  $optionlist.="<option>$option</option>\n";
-	}
+      foreach my $option (@opt) {
+	  my $escopt=&HTML::Entities::encode($option,'\'"&<>');
+	  if ($option eq $lastopt) {
+	      $optionlist.="<option value='".$escopt."' selected=\"on\">$option</option>\n";
+	  } else {
+	      $optionlist.="<option value='".$escopt."'>$option</option>\n";
+	  }
       }
       if ($target ne 'tex') {
 	  if ($Apache::lonhomework::type ne 'exam') {
-	    $optionlist='<select name="HWVAL_'.
-	      $Apache::inputtags::response['-1'].':'.$temp.'">'.
+	      $optionlist='<select name="HWVAL_'.
+		  $Apache::inputtags::response['-1'].':'.$temp.'">'.
 		  $optionlist."</select>\n";
+	  } else {
+	      $optionlist='<u>'.('&nbsp;'x10).'</u>';
 	  }
-	  my $text=$Apache::response::foilgroup{$name.'.text'};
-	  if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') {
-	      $text=$optionlist.$text;
+	  if ($text=~s|<drawoptionlist\s*/>|$optionlist|) {
+	      if ($Apache::lonhomework::type ne 'exam') {
+		  $text='&#149;'.$text;
+	      }
 	  } else {
-	      $text='&#149;'.$text;
+	      if ($Apache::lonhomework::type ne 'exam') {
+		  $text=$optionlist.$text;
+	      }
 	  }
 	  $result.=$break.$text."\n";
 	  if ($Apache::lonhomework::type eq 'exam') {
-	    $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
+	      $result.=&webbubbles(\@opt,\@alphabet,$temp,$lastopt);
 	  }
 	  $temp++;
       } else {
-          my $texoptionlist = &optionlist_correction($optionlist);
-	  if ($displayoptionintex == 0) {
-	      if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist
-	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
-		if ($Apache::lonhomework::type eq 'exam') {
-	          $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\vskip 2 mm/;
-	        }
-	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
-	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
-	        }
-		$result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
-	      } else {
-		  if ($Apache::lonhomework::type eq 'exam') {
-		      $result.= $texoptionlist.'  '.$Apache::response::foilgroup{$name.'.text'};
-		  } else {
-		      $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
-		  }
-	      }
+	  my $texoptionlist='';
+	  if ($displayoptionintex &&
+	      $Apache::lonhomework::type ne 'exam') {
+	      $texoptionlist = &optionlist_correction($TeXlayout,@opt);
+	  }
+	  if ($text=~/<drawoptionlist\s*\/>/) {
+	      $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
+	  }
+
+	  if ($text=~m/\\item /) {
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';
-		  $internal_counter++;
+	          $text=~s/\\item/\\vskip 2 mm/;
 	      }
-	      $displayoptionintex=1;
+	      $result.= $texoptionlist.$text;
 	  } else {
-	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
-		  if ($Apache::lonhomework::type eq 'exam') {
-		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
-		  }
-	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
-	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
-	        }
-		$result.= $Apache::response::foilgroup{$name.'.text'};
-	      } else {
-		  if ($Apache::lonhomework::type eq 'exam') {
-		      $result.= '  '.$Apache::response::foilgroup{$name.'.text'};
-		  } else {
-		      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
-		  }
-	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $result.='\vskip -1 mm \noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).'\end{enumerate} \vskip -9 mm \strut ';
-		  $internal_counter++;
+		  $result.= $texoptionlist.'  '.$text;
+	      } else {
+		  if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;}
 	      }
 	  }
+	  if ($Apache::lonhomework::type eq 'exam') {
+	      $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.
+		  $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).
+		  '\end{enumerate} \vskip -8 mm \strut ';
+	      $internal_counter++;
+	  }
+	  $displayoptionintex=0;
       }
     }
   }
@@ -435,27 +458,30 @@ sub displayfoils {
 
 
 sub optionlist_correction {
-
-    my $texoptionlist = shift;
-    if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) {
-	$texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /;
-	$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;
-	$texoptionlist =~ s/\^(\d+)/\$^{$1}\$/g;
+    my ($TeXlayout,@options) = @_;
+    my $texoptionlist='\\item [] Choices: ';
+    if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}
+    if (scalar(@options) > 0) {
+	foreach my $option (@options) {
+	    $texoptionlist.='{\bf '.
+		&Apache::lonxml::latex_special_symbols($option).
+		'}';
+	    if ($TeXlayout eq 'vertical') {
+		$texoptionlist.=' \vskip 0 mm ',
+	    } else {
+		$texoptionlist.=', ';
+	    }
+	}
+	$texoptionlist=~s/, $//;
+	if ($TeXlayout ne 'vertical') {$texoptionlist.='.';}
     } else {
-	$texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/;
+	if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';}
     }
     return $texoptionlist;
 }
 
 
 sub webbubbles {
-
     my ($ropt,$ralphabet,$temp,$lastopt)=@_;
     my @opt=@$ropt; 
     my @alphabet=@$ralphabet;
@@ -469,8 +495,11 @@ sub webbubbles {
 	}
 	$result.='<td><input type="radio" name="HWVAL_'.
 	    $Apache::inputtags::response['-1'].':'.$temp.
-	    '" value="'.$opt[$ind].'" '.$checked.' />'.$alphabet[$ind].': '.
-	    $opt[$ind].'</td>';
+	    '" value="'.$opt[$ind].'" '.$checked.' />';
+	if ($alphabet[$ind]) {
+	    $result.=$alphabet[$ind].': ';
+	}
+	$result.=$opt[$ind].'</td>';
     }
     $result.='</tr></table>';
     return $result;
@@ -478,31 +507,32 @@ sub webbubbles {
 
 
 sub bubbles {
-
-    my ($ralphabit,$ropt) = @_;
-    my @alphabet = @$ralphabit;
+    my ($ralphabet,$ropt,$response) = @_;
+    my @alphabet = @$ralphabet;
     my @opt = @$ropt;
     my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;
     my $textwidth;
-    if ($ENV{'form.textwidth'} ne '') {
-	$ENV{'form.textwidth'}=~/(\d+)/;
+    if ($env{'form.textwidth'} ne '') {
+	$env{'form.textwidth'}=~/(\d+)/;
 	$textwidth=$1;
     } else {
-	$ENV{'textwidth'}=~/(\d+)/;
-	$textwidth=$1;
+	$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     }
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
 	my $leftmargin;
+	$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
+	if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
 	if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
-	$current_length += (length($opt[$ind])+length($alphabet[$ind])+3)*2;
+	$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
 	if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
 	    $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
 	    $head.='lr';
 	} else {
 	    $line=~s/\&\s*$//;
-	    $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}';
+	    $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
 	    $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
 	    $head ='lr';
 	    $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
@@ -556,7 +586,10 @@ sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
-    &Apache::lonxml::startredirection;
+      &Apache::lonxml::startredirection;
+      if ($target eq 'analyze') {
+	  &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+      }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
     my $level='-2';
@@ -587,35 +620,38 @@ sub end_foil {
   my $result = '';
   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; }
+      if ($target eq 'tex') {$text=~s/\\strut\s*\\\\\s*\\strut/\\vskip 0 mm/;}
+      if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;} 
   }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+	$text='\vskip 5mm $\triangleright$ '.$text;
+    }
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
-      my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
       &Apache::lonxml::debug("Got a name of :$name:");
-      if (!$name) { $name=$Apache::lonxml::curdepth; }
+      if ($name eq "") {
+	  &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+	  $name=$Apache::lonxml::curdepth;
+      }
       &Apache::lonxml::debug("Using a name of :$name:");
+      if (defined($Apache::response::foilnames{$name})) {
+	  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
+      }
+      $Apache::response::foilnames{$name}++;
+      my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
       if ( $Apache::optionresponse::conceptgroup
 	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
-	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-	    $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
-	} else {
-	    $Apache::response::conceptgroup{"$name.text"} = $text;
-	}
+	$Apache::response::conceptgroup{"$name.text"} = $text;
 	$Apache::response::conceptgroup{"$name.location"} = $location;
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
 	$Apache::response::foilgroup{"$name.value"} = $value;
-	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-	    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
-	} else {
-	    $Apache::response::foilgroup{"$name.text"} = $text;
-	}
+	$Apache::response::foilgroup{"$name.text"} = $text;
 	$Apache::response::foilgroup{"$name.location"} = $location;
       }
     }
@@ -626,6 +662,20 @@ sub end_foil {
   return $result;
 }
 
+sub start_drawoptionlist {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target ne 'meta') {
+	return $token->[4];
+    }
+}
+
+sub end_drawoptionlist {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target ne 'meta') {
+	return $token->[2];
+    }
+}
+
 sub insert_foil {
   return '
 <foil name="" value="unused">