--- loncom/homework/matchresponse.pm	2003/10/15 19:52:53	1.20.2.2
+++ loncom/homework/matchresponse.pm	2003/09/15 18:13:52	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.20.2.2 2003/10/15 19:52:53 albertel Exp $
+# $Id: matchresponse.pm,v 1.22 2003/09/15 18:13:52 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,7 +102,7 @@ sub start_itemgroup {
 						     $safeeval,'randomize',
 						     'location');
 	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-    } elsif ($target eq 'web') {
+    } elsif ($target eq 'web' or $target eq 'tex') {
 	$Apache::matchresponse::itemtable{'location'}=
 	    &Apache::lonxml::get_param('location',$parstack,$safeeval);
     }
@@ -144,16 +144,15 @@ sub end_itemgroup {
 	$table.='</table>';
 	$Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {
-	my $table=' \\\\\\\\ \begin{description} ';
+	my $table=' \begin{description} ';
 	my $i=0;
 	foreach my $name (@names) {
 	    $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
 	    $table.='\item['.$alphabet[$i].'] '.
-		$Apache::response::itemgroup{$name.'.text'}.
-		    ' \\\\ ';
+		$Apache::response::itemgroup{$name.'.text'};
 	    $i++;
 	}
-	$table.=' \end{description} \strut \\\\ ';
+	$table.=' \end{description} \strut ';
 	$Apache::matchresponse::itemtable{'display'}=$table;
     }
     return $result;
@@ -295,7 +294,7 @@ sub grade_response {
 	    %{ $Apache::response::itemgroup{'letter_name_map'} };
     }
     foreach my $name (@whichfoils) {
-	my $response = &Apache::response::getresponse($temp);
+	my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"};
 	my $responsename = $letter_name_map{$response};
 	$responsehash{$name}=$responsename;
 	my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -370,7 +369,7 @@ sub displayfoils {
 	%name_letter_map=
 	    %{ $Apache::response::itemgroup{'name_letter_map'} };
     }
-    if ( &Apache::response::show_answer() ) {
+    if (($solved =~ /^correct/) || ($status eq  'SHOW_ANSWER')) {
 	foreach my $name (@whichfoils) {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -423,7 +422,7 @@ sub displayfoils {
 		    $question.='<br />'.$text."\n";
 		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter);
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
@@ -433,7 +432,7 @@ sub displayfoils {
 		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
 		    $internal_counter++;
 	        } else {
-		    $question.=' \\\\ '.$optionlist.$text."\n";
+		    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
 		}
             } 
 	    $temp++;
@@ -488,7 +487,7 @@ sub end_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::matchresponse::conceptgroup=0;
     my $result='';
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
 	#if not there aren't any foils to display and thus no question
 	if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
 	    my @names = @{ $Apache::response::conceptgroup{'names'} };