foxr Tue Apr 4 18:24:08 2006 EDT
Modified files:
/loncom/homework matchresponse.pm
Log:
Revert to description env and insert a <br /> in the html rendering.
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.57 loncom/homework/matchresponse.pm:1.58
--- loncom/homework/matchresponse.pm:1.57 Fri Mar 31 06:10:24 2006
+++ loncom/homework/matchresponse.pm Tue Apr 4 18:24:08 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Full matching style response
#
-# $Id: matchresponse.pm,v 1.57 2006/03/31 11:10:24 foxr Exp $
+# $Id: matchresponse.pm,v 1.58 2006/04/04 22:24:08 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -149,7 +149,8 @@
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map;
my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval);
if ($target eq 'web') {
- my $table='<table>';
+
+ my $table='<br /><table>'; # extra space to match what latex does.
my $i=0;
if ($direction eq 'horizontal') { $table .='<tr>';}
foreach my $name (@names) {
@@ -163,19 +164,15 @@
$table.='</table>';
$Apache::matchresponse::itemtable{'display'}=$table;
} elsif ($target eq 'tex') {
- #my $table='\begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
- my $table="\\\\ \\makebox[\\textwidth][l]{ \\begin{tabular}{ll}\n";
+ 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;
- # $table.='\item['.$alphabet[$i].'] '.
- # $Apache::response::itemgroup{$name.'.text'};
- my $response = $Apache::response::itemgroup{"$name.text"};
- $table .= "$alphabet[$i] & $response \\\\ \n";
+ $table.='\item['.$alphabet[$i].'] '.
+ $Apache::response::itemgroup{$name.'.text'};
$i++;
}
- # $table.=' \end{description} \ \strut ';
- $table .= "\\end{tabular}} \\strut \n\n \\vskip \\parskip ";
+ $table.=' \end{description} \strut ';
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
$Apache::matchresponse::itemtable{'display'}=$table;
}