--- loncom/homework/matchresponse.pm	2003/03/20 18:06:07	1.10
+++ loncom/homework/matchresponse.pm	2003/03/26 18:43:15	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.10 2003/03/20 18:06:07 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.14 2003/03/26 18:43:15 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use HTML::Entities();
 use Math::Random();
 use Apache::optionresponse;
 
+my $flag_for_exam_printing = 1;
 my @Items = ();
 
 BEGIN {
@@ -148,6 +149,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'}.
 		    ' \\\\ ';
@@ -395,8 +397,6 @@ 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;
@@ -411,8 +411,6 @@ 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') {
@@ -423,7 +421,9 @@ sub displayfoils {
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $question.=' '.$optionlist.$text."\n";
-		    $question.=&Apache::optionresponse::bubbles(\@Items_letter,\@Items).'\end{enumerate} \vskip -7 mm \strut ';
+		    my @emptyItems = ();
+		    for (my $i=0;$i<=$#Items;$i++) {push @emptyItems, ' ';}
+		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@Items_letter,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";
 		}
@@ -612,12 +612,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' and $flag_for_exam_printing) {
+		    $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;
 	    }
 	}