--- loncom/homework/caparesponse/caparesponse.pm 2010/06/05 22:25:22 1.238
+++ loncom/homework/caparesponse/caparesponse.pm 2010/10/14 04:02:07 1.240
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.238 2010/06/05 22:25:22 www Exp $
+# $Id: caparesponse.pm,v 1.240 2010/10/14 04:02:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -592,9 +592,16 @@ sub end_numericalresponse {
&get_table_sizes($number_of_bubbles,$bubble_display);
my $j=0;
my $cou=0;
- $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+ $result.='\vskip 2mm \noindent ';
+ $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';
+
for (my $i=0;$i<$number_of_tables;$i++) {
- $result.='\vskip -1 mm \noindent \setlength{\tabcolsep}{2 mm}\begin{tabular}{';
+ if ($i == 0) {
+ $result .= '\vskip -1mm ';
+ } else {
+ $result .= '\vskip 1mm ';
+ }
+ $result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{';
for (my $ind=0;$ind<$table_range[$j];$ind++) {
$result.='p{3 mm}p{'.$celllength.' mm}';
}
@@ -607,7 +614,6 @@ sub end_numericalresponse {
$j++;
$result.='\\\\\end{tabular}\vskip 0 mm ';
}
- $result.='\end{enumerate}';
} else {
$increment = &Apache::response::repetition();
}
@@ -1188,7 +1194,7 @@ sub end_stringresponse {
push(@names,$name);
&Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n");
}
- my ($ad, $msg, $name) =
+ ($ad, $msg, my $name) =
&Apache::inputtags::finalizeawards(\@final_awards,
\@final_msgs,
\@names,1);