--- loncom/homework/caparesponse/caparesponse.pm	2004/02/26 21:13:54	1.136
+++ 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.136 2004/02/26 21:13:54 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;}
     }
@@ -461,8 +463,8 @@ sub make_numerical_bubbles {
 	    &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));
 	    &Math::Random::random_set_seed(@oldseed);
 	    if (defined($format) && $format ne '') {
-		for(my $i=0;$i<=$#bubble_values;$i++) {
-		    $bubble_values[$i]=&format_number($bubble_values[$i],$format,$target);
+		foreach my $value (@bubble_values) {
+		    $value=&format_number($value,$format,$target);
 		}
 	    }
 	    return @bubble_values;