--- loncom/homework/matchresponse.pm 2003/08/19 15:24:52 1.21 +++ loncom/homework/matchresponse.pm 2003/09/22 20:49:01 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.21 2003/08/19 15:24:52 sakharuk Exp $ +# $Id: matchresponse.pm,v 1.23 2003/09/22 20:49:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -144,7 +144,7 @@ sub end_itemgroup { $table.=''; $Apache::matchresponse::itemtable{'display'}=$table; } elsif ($target eq 'tex') { - my $table=' \\\\\\\\ \begin{description} '; + my $table=' \begin{description} '; my $i=0; foreach my $name (@names) { $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; @@ -152,7 +152,7 @@ sub end_itemgroup { $Apache::response::itemgroup{$name.'.text'}; $i++; } - $table.=' \end{description} \strut \\\\ '; + $table.=' \end{description} \strut '; $Apache::matchresponse::itemtable{'display'}=$table; } return $result; @@ -369,7 +369,7 @@ sub displayfoils { %name_letter_map= %{ $Apache::response::itemgroup{'name_letter_map'} }; } - if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { + if ( &Apache::response::show_answer() ) { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=$Apache::response::foilgroup{$name.'.value'}; @@ -432,7 +432,7 @@ sub displayfoils { $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 '; $internal_counter++; } else { - $question.=' \\\\ '.$optionlist.$text."\n"; + $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; } } $temp++;