--- loncom/homework/matchresponse.pm	2004/03/08 23:23:04	1.37
+++ loncom/homework/matchresponse.pm	2004/10/07 18:06:05	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.37 2004/03/08 23:23:04 albertel Exp $
+# $Id: matchresponse.pm,v 1.45 2004/10/07 18:06:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,6 +110,7 @@ sub start_itemgroup {
     } elsif ($target eq 'web' or $target eq 'tex') {
 	$Apache::matchresponse::itemtable{'location'}=
 	    &Apache::lonxml::get_param('location',$parstack,$safeeval);
+	$Apache::matchresponse::TeXitemgroupwidth=&Apache::lonxml::get_param('TeXitemgroupwidth',$parstack,$safeeval,undef,0);
     }
     return $result;
 }
@@ -153,7 +154,7 @@ sub end_itemgroup {
 	$table.='</table>';
 	$Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {
-	my $table=' \begin{description} ';
+	my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
 	my $i=0;
 	foreach my $name (@names) {
 	    $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
@@ -161,7 +162,8 @@ sub end_itemgroup {
 		$Apache::response::itemgroup{$name.'.text'};
 	    $i++;
 	}
-	$table.=' \end{description} \strut ';
+	$table.=' \end{description}  \strut ';
+	if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
 	$Apache::matchresponse::itemtable{'display'}=$table;
     }
     return $result;
@@ -231,7 +233,7 @@ sub start_foilgroup {
     my $result;
     %Apache::response::foilgroup=();
     $Apache::matchresponse::conceptgroup=0;
-    &Apache::response::setrandomnumber();
+    &Apache::response::pushrandomnumber();
     if ($target eq 'edit') {
 	$result.=&Apache::edit::start_table($token)
 	    ."<tr><td>Collection Of Foils</td><td>Delete:"
@@ -265,6 +267,7 @@ sub end_foilgroup {
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
+    &Apache::response::poprandomnumber();
     return $result;
 }
 
@@ -457,19 +460,20 @@ sub displayfoils {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
 		if ($Apache::lonhomework::type ne 'exam') {
-		    $question.='<br />'.$optionlist.$text."\n";
+		    $question.="<br />\n".$optionlist.$text;
 		} else {
-		    $question.='<br />'.$text."\n";
+		    $question.="<br />\n".$text;
 		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter);
+		    my @blank;
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
 		}
 	    } 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{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+		    $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
 		    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
@@ -484,17 +488,47 @@ sub displayfoils {
 	$result=$question.$result;
     } elsif ($result=&itemdisplay('right')) {
 	if ($target ne 'tex') {
-	    $result='<table><tr><td>'.$question.'</td><td>'.$result.
-		'</td></tr></table>';
+	    #remove the first <br />
+	    $question=~s|<br />||;
+	    $result='<table><tr><td valign="top">'.$question.
+		'</td><td valign="top">'.$result.'</td></tr></table>';
 	} else {
-	    $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}';
+	    my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+	    my ($lefttabsize,$righttabsize)=(0,0);
+	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+		$lefttabsize=$tabsize*$1/100;	
+		$righttabsize=0.95*($tabsize-$lefttabsize);
+	    } else {
+		$tabsize=~/(\d+\.?\d*)/;
+		$lefttabsize=$1/2.1;
+		$righttabsize=0.95*($1-$lefttabsize);
+	    }
+	    $lefttabsize.=' mm ';
+	    $righttabsize.=' mm ';
+	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
 	}
     } elsif ($result=&itemdisplay('left')) {
 	if ($target ne 'tex') {
-	    $result='<table><tr><td>'.$result.'</td><td>'.$question.
-		'</td></tr></table>';
+	    #remove the first <br />
+	    $question=~s|<br />||;
+	    $result='<table><tr><td valign="top">'.$result.
+		'</td><td valign="top">'.$question.'</td></tr></table>';
 	} else {
-	    $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}';
+	    my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
+	    my ($lefttabsize,$righttabsize)=(0,0);
+	    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
+		$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
+		$lefttabsize=$tabsize*$1/100;	
+		$righttabsize=0.95*($tabsize-$lefttabsize);
+	    } else {
+		$tabsize=~/(\d+\.?\d*)/;
+		$lefttabsize=$1/2.1;
+		$righttabsize=0.95*($1-$lefttabsize);
+	    }
+	    $lefttabsize.=' mm ';
+	    $righttabsize.=' mm ';
+	    $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
 	}
     }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
@@ -601,6 +635,7 @@ sub end_foil {
 	    if (defined($Apache::response::foilnames{$name})) {
 		&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
 	    }
+	    $Apache::response::foilnames{$name}++;
 	    my $location =&Apache::lonxml::get_param('location',$parstack,
 						     $safeeval);
 	    if ( $Apache::matchresponse::conceptgroup