--- loncom/homework/caparesponse/caparesponse.pm	2004/02/23 20:57:50	1.134
+++ loncom/homework/caparesponse/caparesponse.pm	2004/03/12 16:55:35	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.134 2004/02/23 20:57:50 albertel Exp $
+# $Id: caparesponse.pm,v 1.139 2004/03/12 16:55:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -133,26 +133,26 @@ sub end_numericalresponse {
 		my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 
 		foreach my $key (keys(%Apache::inputtags::params)) {
-		    $expression.= ';my $'. #'
+		    $expression.= ';my $__LC__'. #'
 			$key.'="'.$Apache::inputtags::params{$key}.'"';
 		}
 
 		#no way to enter units, with radio buttons
 		if ($Apache::lonhomework::type eq 'exam' ||
 		    lc($hideunit) eq "yes") {
-		    $expression.=';my $unit=undef;';
+		    $expression.=';my $__LC__unit=undef;';
 		}
 		#sig fig don't make much sense either
 		if (($Apache::lonhomework::type eq 'exam' ||
 		     $ENV{'form.submitted'} eq 'scantron') &&
 		    $tag eq 'numericalresponse') {
-		    $expression.=';my $sig=undef;';
+		    $expression.=';my $__LC__sig=undef;';
 		}
 
 		if ($tag eq 'formularesponse') {
-		    $expression.=';my $type="fml";';
+		    $expression.=';my $__LC__type="fml";';
 		} elsif ($tag eq 'numericalresponse') {
-		    $expression.=';my $type="float";';
+		    $expression.=';my $__LC__type="float";';
 		}
 		$expression.="');";
 		my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
@@ -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;}
     }
@@ -401,7 +403,7 @@ sub get_table_sizes {
 	$textwidth=$1.'.'.$2;
     }
     my $bubbles_per_line=int($textwidth/$cell_width);
-    if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==2)) {$bubbles_per_line=$number_of_bubbles/2;}
+    if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}
     my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
     my @table_range = ();
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
@@ -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);
 }