--- loncom/homework/matchresponse.pm 2003/09/15 18:13:52 1.22 +++ loncom/homework/matchresponse.pm 2003/10/13 19:25:30 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.22 2003/09/15 18:13:52 sakharuk Exp $ +# $Id: matchresponse.pm,v 1.26 2003/10/13 19:25:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -358,7 +358,6 @@ sub displayfoils { \%Apache::response::foilgroup); my $part=$Apache::inputtags::part; my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; - my $status=$Apache::inputtags::status[-1]; my %letter_name_map; if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { %letter_name_map= @@ -369,7 +368,7 @@ sub displayfoils { %name_letter_map= %{ $Apache::response::itemgroup{'name_letter_map'} }; } - if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { + if ( &Apache::response::show_answer() && ($target ne 'tex')) { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=$Apache::response::foilgroup{$name.'.value'}; @@ -590,7 +589,7 @@ sub end_foil { } } else { if ($target eq 'tex') { - $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; + $Apache::response::foilgroup{"$name.text"} = $text; } else { $Apache::response::foilgroup{"$name.text"} = $text; }