--- loncom/homework/matchresponse.pm	2003/06/30 20:23:33	1.19
+++ loncom/homework/matchresponse.pm	2003/10/10 16:47:25	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.19 2003/06/30 20:23:33 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.25 2003/10/10 16:47:25 albertel 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;
@@ -248,6 +247,7 @@ sub end_foilgroup {
 	} elsif ( $target eq 'grade') {
 	    &grade_response($max,$randomize);
 	}
+	&Apache::lonxml::increment_counter(&getfoilcounts($max));
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -369,7 +369,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'};
@@ -389,6 +389,7 @@ sub displayfoils {
 	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
 	my @alphabet=('A'..'Z');
 	my @used_letters=sort(keys(%letter_name_map));
+	my $internal_counter=$Apache::lonxml::counter;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
@@ -428,9 +429,10 @@ sub displayfoils {
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+		    $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++;
@@ -485,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'} };
@@ -588,7 +590,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;
 		    }