--- loncom/homework/caparesponse/caparesponse.pm	2004/02/13 21:12:54	1.131
+++ loncom/homework/caparesponse/caparesponse.pm	2004/02/26 16:36:48	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.131 2004/02/13 21:12:54 albertel Exp $
+# $Id: caparesponse.pm,v 1.135 2004/02/26 16:36:48 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -384,23 +384,24 @@ sub get_table_sizes {
 	my $cell_width_real=0;
 	if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
 	    $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
-	} elsif ($member=~/(\d*)\.?(\d*)/) {
-	    $cell_width_real=(length($1)+length($2)+2)*$scale;
+	} elsif ($member=~/(\d*)\.(\d*)/) {
+	    $cell_width_real=(length($1)+length($2)+3)*$scale;
 	} else {
 	    $cell_width_real=(length($member)+1)*$scale;
 	}
 	if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
     }
-    $cell_width+=8;
+    $cell_width+=8; 
     my $textwidth;
     if ($ENV{'form.textwidth'} ne '') {
-	$ENV{'form.textwidth'}=~/(\d+)/;
-	$textwidth=$1;
+	$ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     } else {
-	$ENV{'textwidth'}=~/(\d+)/;
-	$textwidth=$1;
+	$ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     }
     my $bubbles_per_line=int($textwidth/$cell_width);
+    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;}
@@ -458,6 +459,11 @@ sub make_numerical_bubbles {
 	    @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);
 	    &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 '') {
+		foreach my $value (@bubble_values) {
+		    $value=&format_number($value,$format,$target);
+		}
+	    }
 	    return @bubble_values;
 	}
 	if (defined($$incorrect[0]) &&
@@ -513,6 +519,16 @@ sub get_sigrange {
 	}
 	if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
     }
+    if (($sig_ubound<$sig_lbound) ||
+	($sig_lbound > 15) ||
+	($sig =~/(\+|-)/ ) ) {
+	my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
+	if ($ENV{'request.state'} eq 'construct') {
+	    $errormsg.=
+		&Apache::loncommon::help_open_topic('Significant_Figures');
+	}
+	&Apache::lonxml::error($errormsg);
+    }
     return ($sig_ubound,$sig_lbound);
 }