--- loncom/homework/matchresponse.pm	2007/03/27 19:20:49	1.61
+++ loncom/homework/matchresponse.pm	2011/11/08 01:48:51	1.81.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.61 2007/03/27 19:20:49 albertel Exp $
+# $Id: matchresponse.pm,v 1.81.2.1 2011/11/08 01:48:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Math::Random();
 use Apache::optionresponse();
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::lonxml;
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -53,14 +54,16 @@ sub start_matchresponse {
 	$result=&Apache::response::meta_package_write('matchresponse');
     } elsif ($target eq 'edit' ) {
 	$result.=&Apache::edit::start_table($token).
-	    '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".
-	    &Apache::edit::deletelist($target,$token)
-	    ."</td><td>&nbsp".&Apache::edit::end_row()
-	    .&Apache::edit::start_spanning_row();
+	    '<tr><td>'.&Apache::lonxml::description($token).'</td>'
+           .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+	   .&Apache::edit::deletelist($target,$token)
+           .'</span></td>'
+           .'<td>&nbsp;'.&Apache::edit::end_row()
+	   .&Apache::edit::start_spanning_row();
 	
 	$result.=
 	    &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
-	    &Apache::edit::select_arg('Randomize Foil Order','randomize',
+	    &Apache::edit::select_arg('Randomize Foil Order:','randomize',
 				      ['yes','no'],$token).
 	    &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
     } elsif ($target eq 'modified') {
@@ -70,7 +73,10 @@ sub start_matchresponse {
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'analyze') {
 	my $part_id="$Apache::inputtags::part.$id";
+        $Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse';
 	push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+	push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
+	      1);
     }
     return $result;
 }
@@ -97,12 +103,12 @@ sub start_itemgroup {
     if ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
-					   ['yes','no'],$token);
+					   ['yes','no'],$token).'&nbsp;'x 3;
 	$result.=&Apache::edit::select_arg('Items Display Location:',
 					   'location',
 					   ['top','bottom','left','right'],
-					   $token);
-	$result.=&Apache::edit::select_arg('Items Display Directection:',
+					   $token).'&nbsp;'x 3;
+	$result.=&Apache::edit::select_arg('Items Display Direction:',
 					   'direction',
 					   ['vertical','horizontal'],
 					   $token);
@@ -125,7 +131,11 @@ sub end_itemgroup {
     my $result;
 
     if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
-    if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }
+    if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
+        if(!@{ $Apache::response::itemgroup{'names'} }) { return; }
+    } else {
+        return;
+    }
     my @names=@{ $Apache::response::itemgroup{'names'} };
     my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
     if ($randomize ne 'no' ) {
@@ -174,7 +184,7 @@ sub end_itemgroup {
 	    $i++;
 	}
 	$table.=' \end{description}  \strut ';
-	if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
+	if ($Apache::lonhomework::type eq 'exam')  {$table.='\vskip -13 mm \strut ';}
 	$Apache::matchresponse::itemtable{'display'}=$table;
 	$Apache::lonxml::post_evaluate=0;
     }
@@ -192,7 +202,8 @@ sub start_item {
 	$result=&Apache::edit::tag_start($target,$token,"Item");
 	$result.=&Apache::edit::text_arg('Name:','name',$token);
 	if ($randomize ne 'no') {
-	    $result.=&Apache::edit::select_arg('Location:','location',
+	    $result.='&nbsp;'x 3 .
+                     &Apache::edit::select_arg('Location:','location',
 					       ['random','top','bottom'],
 					       $token);
 	}
@@ -245,12 +256,14 @@ sub start_foilgroup {
     my $result;
     %Apache::response::foilgroup=();
     $Apache::matchresponse::conceptgroup=0;
-    &Apache::response::pushrandomnumber();
+    &Apache::response::pushrandomnumber(undef,$target);
     if ($target eq 'edit') {
 	$result.=&Apache::edit::start_table($token)
-	    ."<tr><td>Collection Of Foils</td><td>Delete:"
+	    .'<tr><td>'.&mt('Collection Of Foils').'</td>'
+            .'<td><span class="LC_nobreak">'.&mt('Delete?')
 	    .&Apache::edit::deletelist($target,$token)
-	    ."</td><td>&nbsp;".&Apache::edit::end_row()
+	    .'</span></td>'
+            .'<td>&nbsp;'.&Apache::edit::end_row()
             .&Apache::edit::start_spanning_row()."\n";
     }
     return $result;
@@ -259,6 +272,9 @@ sub start_foilgroup {
 sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+    my $part        = $Apache::inputtags::part;
+    my $response_id = $Apache::inputtags::response[-1];
+
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
 	my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
 	my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
@@ -276,7 +292,12 @@ sub end_foilgroup {
 						 ['text','value','location']);
 	    #FIXME need to store options in some way
 	}
-	&Apache::lonxml::increment_counter(&getfoilcounts($max));
+	&Apache::lonxml::increment_counter(&getfoilcounts($max), 
+					   "$part.$response_id");
+	if ($target eq 'analyze') {
+	    &Apache::lonhomework::set_bubble_lines();
+	}
+
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -294,16 +315,22 @@ sub whichfoils {
 
 sub displayanswers {
     my ($max,$randomize,@opt)=@_;
-    if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
+    if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+        if (!@{ $Apache::response::foilgroup{'names'} }) { return; }
+    } else {
+        return;
+    }
     my @names = @{ $Apache::response::foilgroup{'names'} };
     my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max),
 						   $randomize,
 					  &Apache::response::showallfoils(),
 					 \%Apache::response::foilgroup);
     my %name_letter_map;
-    if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
-	%name_letter_map=
-	    %{ $Apache::response::itemgroup{'name_letter_map'} };
+    if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') {
+        if (%{$Apache::response::itemgroup{'name_letter_map'}}) {
+            %name_letter_map=
+                %{ $Apache::response::itemgroup{'name_letter_map'} };
+        }
     }
     my $result;
     if ($Apache::lonhomework::type eq 'exam') {
@@ -337,11 +364,14 @@ sub grade_response {
     if (!&Apache::response::submitted()) { return; }
     my %responsehash;
     my %grade;
+    my %answerhash;
     my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
     my %letter_name_map;
-    if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
-	%letter_name_map=
-	    %{ $Apache::response::itemgroup{'letter_name_map'} };
+    if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') {
+        if (%{$Apache::response::itemgroup{'letter_name_map'}}) {
+            %letter_name_map=
+                %{ $Apache::response::itemgroup{'letter_name_map'} };
+        }
     }
     my @items;
     foreach my $name (@whichfoils) {
@@ -349,6 +379,9 @@ sub grade_response {
 	push(@items,$response);
 	my $responsename = $letter_name_map{$response};
 	my $value=$Apache::response::foilgroup{$name.'.value'};
+        if ($Apache::lonhomework::type eq 'randomizetry') {
+            $answerhash{$name} = $value;
+        }
 	if ( $response =~ /[^\s]/) {
 	    $responsehash{$name}=$responsename;
 	    &Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n");
@@ -375,9 +408,24 @@ sub grade_response {
 	$itemstr;
     $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=
 	$gradestr;
-    if ($Apache::lonhomework::type eq 'survey') {
+    if ($Apache::lonhomework::type eq 'randomizetry') {
+        $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichfoils);
+    }
+    if (($Apache::lonhomework::type eq 'survey') ||
+        ($Apache::lonhomework::type eq 'surveycred') ||
+        ($Apache::lonhomework::type eq 'anonsurvey') ||
+        ($Apache::lonhomework::type eq 'anonsurveycred')) {
 	if ($ignored == 0) {
-	    my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+	    my $ad;
+            if ($Apache::lonhomework::type eq 'anonsurvey') {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
+            } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
+            } elsif ($Apache::lonhomework::type eq 'surveycred') {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
+            } else {
+                $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+            }
 	    &Apache::response::handle_previous(\%previous,$ad);
 	} elsif ($wrong==0 && $right==0) {
 	} else {
@@ -415,6 +463,24 @@ sub grade_response {
     }
 }
 
+sub format_prior_answer {
+    my ($mode,$answer,$other_data) = @_;
+    my %answer      =&Apache::lonnet::str2hash($answer);
+    my $foil_order  =$other_data->[0];
+    my %grading     =&Apache::lonnet::str2hash($other_data->[1]);
+    my @items       =&Apache::lonnet::str2array($other_data->[2]);
+    my $output;
+    
+    foreach my $name (@{ $foil_order }) {
+	my $item=shift(@items);
+	$output .= '<tr><td>'.$item.'</td></tr>';
+    }
+    return if (!defined($output));
+
+    $output = '<table class="LC_prior_match">'.$output.'</table>';
+    return $output;
+}
+
 sub itemdisplay {
     my ($location)=@_;
     if ($location eq 'top' &&
@@ -426,8 +492,11 @@ sub itemdisplay {
     }
     return undef;
 }
+
 sub displayfoils {
     my ($target,$max,$randomize)=@_;
+    my ($tabsize, $lefttabsize, $righttabsize);
+
     my $result;
     my $question;
     my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
@@ -437,14 +506,18 @@ sub displayfoils {
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
     my %letter_name_map;
-    if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) {
-	%letter_name_map=
-	    %{ $Apache::response::itemgroup{'letter_name_map'} };
+    if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') {
+        if (%{$Apache::response::itemgroup{'letter_name_map'}}) {
+            %letter_name_map=
+                %{ $Apache::response::itemgroup{'letter_name_map'} };
+        }
     }
     my %name_letter_map;
-    if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) {
-	%name_letter_map=
-	    %{ $Apache::response::itemgroup{'name_letter_map'} };
+    if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') {
+        if (%{$Apache::response::itemgroup{'name_letter_map'}}) {
+            %name_letter_map=
+                %{ $Apache::response::itemgroup{'name_letter_map'} };
+        }
     }
     if ( &Apache::response::show_answer() && ($target ne 'tex')) {
 	foreach my $name (@whichfoils) {
@@ -462,7 +535,18 @@ sub displayfoils {
 	my $temp=1;
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
-	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+        my ($lastresponse,$newvariation);
+        if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') ||
+            ($Apache::lonhomework::type eq 'randomizetry')) &&
+            ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+            if ($env{'form.'.$part.'.rndseed'} ne
+                $Apache::lonhomework::history{"resource.$part.rndseed"}) {
+                $newvariation = 1;
+            }
+        }
+        unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred') && (defined($env{'form.grade_symb'}))) || $newvariation) {
+	    $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
+        }
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
 	my @alphabet=('A'..'Z');
 	my @used_letters=sort(keys(%letter_name_map));
@@ -475,15 +559,34 @@ sub displayfoils {
 		$optionlist="<option></option>\n";
 	    } else {
 		if ($Apache::lonhomework::type ne 'exam') {
-		    $optionlist='\framebox[5 mm][s]{\tiny\strut}';
-		}
+                    if($env{'form.pdfFormFields'} eq 'yes'
+                       && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
+                        my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&';
+                        $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
+                    } else {
+
+                        $optionlist='\framebox[10 mm][s]{\tiny\strut}';
+                    }
+                }
 	    }
 	    my $option;
 	    foreach $option (@used_letters) {
 		if ($option eq $last_letter) {
-		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
+		    if ($target ne 'tex') {
+                        $optionlist.="<option selected=\"selected\">$option</option>\n";
+                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER'
+                             && $Apache::lonhomework::type ne 'exam') {
+                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+                    }
 		} else {
-		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
+		    if ($target ne 'tex') {
+                        $optionlist.="<option>$option</option>\n";
+                    } elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+                             && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER'
+                             && $Apache::lonhomework::type ne 'exam') {
+                        $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+                    }
 		}
 	    }
 	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
@@ -493,6 +596,25 @@ sub displayfoils {
 		        $optionlist."</select>\n";
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
+	    #
+            #  Factor out the tex computations of the left/right 1/2 minipage
+	    #  widths for left or right positioning.  This allows us
+	    #  to, if necessary constrain the bubble widths:
+	    #
+	    if ($target eq 'tex'   &&
+		(&itemdisplay('left') || &itemdisplay('right'))) {
+		$tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
+		($lefttabsize,$righttabsize)=(0,0);
+		if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+		    $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+		    $lefttabsize=$tabsize*$1/100;	
+		    $righttabsize=0.95*($tabsize-$lefttabsize);
+		} else {
+		    $tabsize=~/(\d+\.?\d*)/;
+		    $lefttabsize=$1/2.1;
+		    $righttabsize=0.95*($1-$lefttabsize);
+		}
+	    }
 	    if ($target ne 'tex') {
 		if ($Apache::lonhomework::type ne 'exam') {
 		    $question.="<br />\n".$optionlist.$text;
@@ -504,14 +626,30 @@ sub displayfoils {
 		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
 		}
 	    } else {		
+		# Note that if left or right positioned, we must
+		# confine the bubbles to righttabsize:
+		#
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
+		    $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
+			.'\item \hskip -3mm \textbf{'.$internal_counter.'}';
+		    if (&itemdisplay('left') || &itemdisplay('right')) {
+			$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
+		    }
+		    else {
+			$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
+		    }
+		    $question .= '\end{list} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
-		    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
+                    if($env{'form.pdfFormFields'} eq 'yes' 
+                            && $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
+                        $question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut';
+                    } else {
+                        $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
+                    }
 		}
             } 
 	    $temp++;
@@ -528,17 +666,6 @@ sub displayfoils {
 	    $result='<table><tr><td valign="top">'.$question.
 		'</td><td valign="top">'.$result.'</td></tr></table>';
 	} else {
-	    my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
-	    my ($lefttabsize,$righttabsize)=(0,0);
-	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
-		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
-		$lefttabsize=$tabsize*$1/100;	
-		$righttabsize=0.95*($tabsize-$lefttabsize);
-	    } else {
-		$tabsize=~/(\d+\.?\d*)/;
-		$lefttabsize=$1/2.1;
-		$righttabsize=0.95*($1-$lefttabsize);
-	    }
 	    $lefttabsize.=' mm ';
 	    $righttabsize.=' mm ';
 	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
@@ -550,22 +677,22 @@ sub displayfoils {
 	    $result='<table><tr><td valign="top">'.$result.
 		'</td><td valign="top">'.$question.'</td></tr></table>';
 	} else {
-	    my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
-	    my ($lefttabsize,$righttabsize)=(0,0);
-	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
-		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
-		$lefttabsize=$tabsize*$1/100;	
-		$righttabsize=0.95*($tabsize-$lefttabsize);
-	    } else {
-		$tabsize=~/(\d+\.?\d*)/;
-		$lefttabsize=$1/2.1;
-		$righttabsize=0.95*($1-$lefttabsize);
-	    }
 	    $lefttabsize.=' mm ';
 	    $righttabsize.=' mm ';
 	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
 	}
     }
+    if ($target eq 'web') {
+        my $questiontype;
+        if ($Apache::lonhomework::type eq 'randomizetry') {
+            $questiontype = $Apache::lonhomework::type;
+        }
+	&Apache::response::setup_prior_tries_hash(\&format_prior_answer,
+						  [\@whichfoils,
+						   'submissiongrading',
+						   'submissionitems'],
+                                                  $questiontype);
+    }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
     return $result;
 }
@@ -635,9 +762,11 @@ sub start_foil {
 	if ($$tagstack[-2] eq 'conceptgroup') { $level = '-3'; }
 	$result.=&Apache::edit::text_arg('Name:','name',$token);
 	my @names;
-	if (defined(@{ $Apache::response::itemgroup{'names'} })) {
-	    @names=@{ $Apache::response::itemgroup{'names'} };
-	}
+        if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') {
+            if (@{ $Apache::response::itemgroup{'names'} }) {
+                @names=@{ $Apache::response::itemgroup{'names'} };
+            }
+        }
 	$result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',@names],$token,'15');
 	my $randomize=&Apache::lonxml::get_param('randomize',$parstack,
 						 $safeeval,'-3');
@@ -673,23 +802,25 @@ sub end_foil {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	    &Apache::lonxml::debug("Got a name of :$name:");
 	    if (!$name) {
-		&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+		&Apache::lonxml::warning(&mt('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::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));
 	    }
 	    $Apache::response::foilnames{$name}++;
 	    my $location =&Apache::lonxml::get_param('location',$parstack,
 						     $safeeval);
 	    if ( $Apache::matchresponse::conceptgroup
 		 && !&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.location"} = $location;
 	    } else {
+
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
 		$Apache::response::foilgroup{"$name.text"} = $text;