--- loncom/homework/matchresponse.pm 2006/03/31 11:10:24 1.57 +++ loncom/homework/matchresponse.pm 2007/03/27 19:20:49 1.61 @@ -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.61 2007/03/27 19:20:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -149,7 +149,8 @@ sub end_itemgroup { $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval); if ($target eq 'web') { - my $table=''; + + my $table='
'; # extra space to match what latex does. my $i=0; if ($direction eq 'horizontal') { $table .='';} foreach my $name (@names) { @@ -162,22 +163,20 @@ sub end_itemgroup { if ($direction eq 'horizontal') { $table .='';} $table.='
'; $Apache::matchresponse::itemtable{'display'}=$table; + $Apache::lonxml::post_evaluate=0; } 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"; + # $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; + $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; + $Apache::lonxml::post_evaluate=0; } return $result; } @@ -266,6 +265,7 @@ sub end_foilgroup { $safeeval,'-2'); if ($target eq 'web' || $target eq 'tex') { $result=&displayfoils($target,$max,$randomize); + $Apache::lonxml::post_evaluate=0; } elsif ($target eq 'answer' ) { $result=&displayanswers($max,$randomize); } elsif ( $target eq 'grade') { @@ -487,7 +487,8 @@ sub displayfoils { } } if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { - $optionlist='\n"; }