--- loncom/homework/caparesponse/caparesponse.pm 2004/02/26 16:36:48 1.135 +++ loncom/homework/caparesponse/caparesponse.pm 2004/03/02 16:09:42 1.138 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.135 2004/02/26 16:36:48 sakharuk Exp $ +# $Id: caparesponse.pm,v 1.138 2004/03/02 16:09:42 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -382,12 +382,14 @@ sub get_table_sizes { my $cell_width=0; foreach my $member (@$rbubble_values) { my $cell_width_real=0; - if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) { + if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$\\times\s*10\^{(\+|-)?(\d+)}\$/) { + $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale; + } elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) { $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale; - } elsif ($member=~/(\d*)\.(\d*)/) { + } elsif ($member=~/(\d*)\.(\d*)/) { $cell_width_real=(length($1)+length($2)+3)*$scale; } else { - $cell_width_real=(length($member)+1)*$scale; + $cell_width_real=(length($member)+1)*$scale*0.9; } if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;} } @@ -410,6 +412,7 @@ sub get_table_sizes { push @table_range,($number_of_bubbles % $bubbles_per_line); } $cell_width-=8; + $cell_width=$cell_width*3/4; return ($cell_width,$number_of_tables,@table_range); }