--- loncom/homework/matchresponse.pm 2004/04/02 17:58:16 1.39
+++ loncom/homework/matchresponse.pm 2004/07/08 17:51:31 1.44
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.39 2004/04/02 17:58:16 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.44 2004/07/08 17:51:31 sakharuk 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;
}
@@ -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)
."
Collection Of Foils | Delete:"
@@ -265,6 +267,7 @@ sub end_foilgroup {
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
+ &Apache::response::poprandomnumber();
return $result;
}
@@ -462,14 +465,15 @@ sub displayfoils {
$question.=' '.$text."\n";
}
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";
@@ -488,10 +492,19 @@ sub displayfoils {
' |
';
} else {
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
- $tabsize=~/(\d+\.?\d*)/;
- $tabsize=$1/2.1;
- $tabsize.=' mm ';
- $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}\end{tabular}';
+ 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') {
@@ -499,10 +512,19 @@ sub displayfoils {
'';
} else {
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
- $tabsize=~/(\d+\.?\d*)/;
- $tabsize=$1/2.1;
- $tabsize.=' mm ';
- $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}\end{tabular}';
+ 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.="
";} else {$result.=' \\\\ ';}