version 1.15, 2003/07/01 20:13:14
|
version 1.20, 2003/09/24 17:57:42
|
Line 121 sub get_correct_order {
|
Line 121 sub get_correct_order {
|
} |
} |
@value_names = |
@value_names = |
sort { |
sort { |
if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] cmp $b->[0]);} |
if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] <=> $b->[0]);} |
return 0; |
return 0; |
} @value_names; |
} @value_names; |
my @value_names_tmp=@value_names; |
my @value_names_tmp=@value_names; |
Line 241 sub displayfoils {
|
Line 241 sub displayfoils {
|
my $status=$Apache::inputtags::status[-1]; |
my $status=$Apache::inputtags::status[-1]; |
my @whichopt=(1..($#whichfoils+1)); |
my @whichopt=(1..($#whichfoils+1)); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { |
if ( &Apache::response::show_answer() && ($target ne 'tex')) { |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $value=shift(@correctorder); |
my $value=shift(@correctorder); |
$result.='<br />'.$value.':'.$text; |
if ($target eq 'web') {$result.='<br />';} else {$result.=' \strut\\\\\strut ';} |
|
$result.=$value.':'.$text; |
} |
} |
} else { |
} else { |
my $i = 0; |
my $i = 0; |
Line 291 sub displayfoils {
|
Line 292 sub displayfoils {
|
$result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut '; |
$result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} else { |
$result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; |
$result.=' \vskip 0mm \framebox[5 mm][s]{\tiny\strut} '.$text."\n"; |
} |
} |
} |
} |
$temp++; |
$temp++; |