--- loncom/homework/matchresponse.pm	2003/03/19 18:36:37	1.7
+++ loncom/homework/matchresponse.pm	2003/05/06 22:08:28	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.7 2003/03/19 18:36:37 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.17 2003/05/06 22:08:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,8 +33,6 @@ use HTML::Entities();
 use Math::Random();
 use Apache::optionresponse;
 
-my @Items;
-
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
 }
@@ -89,6 +87,7 @@ sub start_itemgroup {
     my $result;
     %Apache::response::itemgroup=();
     %Apache::matchresponse::itemtable=();
+
     if ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::select_arg('Randomize Order:','randomize',
@@ -114,6 +113,7 @@ sub end_itemgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
 
+    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
     if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; }
     my @names=@{ $Apache::response::itemgroup{'names'} };
     my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval);
@@ -128,10 +128,9 @@ sub end_itemgroup {
     foreach my $name (@names) {
 	$letter_name_map{$alphabet[$i]}=$name;
 	$name_letter_map{$name}=$alphabet[$i];
-	push @Items, $alphabet[$i];
 	$i++;
     }
-     $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
+    $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map;
     $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
     if ($target eq 'web') {
 	my $table='<table>';
@@ -148,6 +147,7 @@ sub end_itemgroup {
 	my $table=' \\\\\\\\ \begin{tabular}{ll} ';
 	my $i=0;
 	foreach my $name (@names) {
+	    $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
 	    $table.=' '.$alphabet[$i].' & '.
 		$Apache::response::itemgroup{$name.'.text'}.
 		    ' \\\\ ';
@@ -155,7 +155,7 @@ sub end_itemgroup {
 	}
 	$table.=' \end{tabular} \\\\ ';
 	$Apache::matchresponse::itemtable{'display'}=$table;
-    } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+    }
     return $result;
 }
 
@@ -383,7 +383,9 @@ sub displayfoils {
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
-	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);    
+	my @alphabet=('A'..'Z');
+	my @used_letters=sort(keys(%letter_name_map));
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $last_letter=$name_letter_map{$lastopt};
@@ -393,12 +395,10 @@ sub displayfoils {
 	    } 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))) {
+	    foreach $option (@used_letters) {
 		if ($option eq $last_letter) {
 		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
 		} else {
@@ -409,20 +409,19 @@ sub displayfoils {
 	        $optionlist='<select name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
-	    } else {
-		$optionlist=$optionlist;
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
 		$question.='<br />'.$optionlist.$text."\n";
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@Items,\@Items);
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
-		    $question.=&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate} \vskip -7 mm \strut ';
-		    &Apache::lonxml::increment_counter();
+		    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 ';
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";
 		}
@@ -611,12 +610,24 @@ sub end_foil {
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
-		$Apache::response::conceptgroup{"$name.text"} = $text;
+		if ($target eq 'tex') {
+		    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		} else {
+		    $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;
+		if ($Apache::lonhomework::type eq 'exam') {
+		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		} else {
+		    if ($target eq 'tex') {
+			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		    } else {
+			$Apache::response::foilgroup{"$name.text"} = $text;
+		    }
+		}
 		$Apache::response::foilgroup{"$name.location"} = $location;
 	    }
 	}