--- loncom/homework/optionresponse.pm 2004/07/20 13:38:47 1.115 +++ loncom/homework/optionresponse.pm 2004/08/25 19:38:58 1.118 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.115 2004/07/20 13:38:47 sakharuk Exp $ +# $Id: optionresponse.pm,v 1.118 2004/08/25 19:38:58 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -456,7 +456,7 @@ sub optionlist_correction { $texoptionlist.=', '; } } - chop($texoptionlist); + $texoptionlist=~s/, $//; if ($TeXlayout ne 'vertical') {$texoptionlist.='.';} } else { if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';} @@ -491,7 +491,7 @@ sub webbubbles { sub bubbles { - my ($ralphabit,$ropt) = @_; + my ($ralphabit,$ropt,$responce) = @_; my @alphabet = @$ralphabit; my @opt = @$ropt; my ($result,$head,$line) =('','',''); @@ -508,6 +508,7 @@ sub bubbles { for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { my $leftmargin; $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); + if ($responce eq 'rankresponce') {$opt[$ind]='Rank '.$opt[$ind];} if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} $current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2; if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { @@ -649,12 +650,16 @@ sub end_foil { sub start_drawoptionlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return $token->[4]; + if ($target ne 'meta') { + return $token->[4]; + } } sub end_drawoptionlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - return $token->[2]; + if ($target ne 'meta') { + return $token->[2]; + } } sub insert_foil {