--- loncom/homework/matchresponse.pm	2003/03/17 19:54:20	1.5
+++ loncom/homework/matchresponse.pm	2003/03/26 22:59:09	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.5 2003/03/17 19:54:20 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.16 2003/03/26 22:59:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::matchresponse;
 use strict;
 use HTML::Entities();
 use Math::Random();
+use Apache::optionresponse;
 
 BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
@@ -86,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',
@@ -144,6 +146,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'}.
 		    ' \\\\ ';
@@ -379,37 +382,48 @@ 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 $localcount = 1;
+	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};
 	    my $optionlist = '';
-	    if ($target ne 'tex') {$optionlist="<option></option>\n";} else {$optionlist=' '.$localcount.'. '; $localcount++;}
+	    if ($target ne 'tex') {
+		$optionlist="<option></option>\n";
+	    } else {
+		if ($Apache::lonhomework::type ne 'exam') {
+		    $optionlist='\framebox[5 mm][s]{\tiny\strut}';
+		}
+	    }
 	    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";
-		    }
+		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
 		} else {
-		    if ($target ne 'tex') {
-			$optionlist.="<option>$option</option>\n";
-		    }
+		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
 		}
 	    }
 	    if ($target ne 'tex') {
 	        $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";
-	    } else {
-		$question.=' \\\\ '.$optionlist.$text."\n";
+		if ($Apache::lonhomework::type eq 'exam') {
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters);
+		}
+	    } else {		
+		if ($Apache::lonhomework::type eq 'exam') {
+		    $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 ';
+	        } else {
+		    $question.=' \\\\ '.$optionlist.$text."\n";
+		}
             } 
 	    $temp++;
 	}
@@ -595,12 +609,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;
 	    }
 	}