--- loncom/homework/optionresponse.pm 2007/03/01 02:33:28 1.138 +++ loncom/homework/optionresponse.pm 2007/04/16 22:50:41 1.142 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.138 2007/03/01 02:33:28 albertel Exp $ +# $Id: optionresponse.pm,v 1.142 2007/04/16 22:50:41 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -367,11 +367,11 @@ sub setup_prior_tries_hash { my $output; foreach my $name (@$whichopt) { next if (!defined($lastresponse{$name})); - $output .= ''.$lastresponse{$name}.''; + $output .= ''.$lastresponse{$name}.''; } next if (!defined($output)); $output = - ''.$output.'
'; + ''.$output.'
'; $Apache::inputtags::submission_display{$key} = $output; } } @@ -444,7 +444,8 @@ sub displayfoils { } if ($target ne 'tex') { if ($Apache::lonhomework::type ne 'exam') { - $optionlist='\n"; } else { @@ -559,25 +560,32 @@ sub webbubbles { sub bubbles { - my ($ralphabet,$ropt,$response) = @_; + my ($ralphabet,$ropt,$response, $max_width) = @_; my @alphabet = @$ralphabet; my @opt = @$ropt; my ($result,$head,$line) =('','',''); my $number_of_bubbles = $#opt + 1; my $current_length = 0; my $textwidth; - if ($env{'form.textwidth'} ne '') { + if (defined($max_width)) { + $textwidth=$max_width; + &Apache::lonxml::debug("Max width passed in: $max_width"); + } elsif ($env{'form.textwidth'} ne '') { $env{'form.textwidth'}=~/(\d+)/; $textwidth=$1; + &Apache::lonxml::debug("Max width from form: $textwidth"); } else { $env{'form.textwidth'}=~/(\d*)\.?(\d*)/; $textwidth=$1.'.'.$2; + &Apache::lonxml::debug("Max width defaults? $textwidth"); } + &Apache::lonxml::debug("Final maxwidth: $textwidth"); for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { my $leftmargin; $opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); if ($response eq 'rankresponse') {$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) { $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';