--- loncom/homework/matchresponse.pm	2003/03/18 21:26:33	1.6
+++ loncom/homework/matchresponse.pm	2003/03/19 19:10:16	1.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.6 2003/03/18 21:26:33 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.8 2003/03/19 19:10:16 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use HTML::Entities();
 use Math::Random();
 use Apache::optionresponse;
 
-my @Items;
+my @Items = ();
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -388,8 +388,15 @@ sub displayfoils {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
 	    my $optionlist = '';
-	    if ($target ne 'tex') {$optionlist="<option></option>\n";} 
-	       else {$optionlist='\framebox[5 mm][s]{\tiny\strut}';}
+	    if ($target ne 'tex') {
+		$optionlist="<option></option>\n";
+	    } else {
+		if ($Apache::lonhomework::type ne 'exam') {
+		    $optionlist='\framebox[5 mm][s]{\tiny\strut}';
+		} else {
+		    $optionlist='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+		}
+	    }
 	    my $option;
 	    foreach $option (sort(keys(%letter_name_map))) {
 		if ($option eq $last_letter) {
@@ -414,7 +421,7 @@ sub displayfoils {
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
-		    $question.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate}\strut ';
+		    $question.=&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate} \vskip -7 mm \strut ';
 		    &Apache::lonxml::increment_counter();
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";