--- loncom/homework/caparesponse/caparesponse.pm	2004/02/13 21:05:34	1.130
+++ loncom/homework/caparesponse/caparesponse.pm	2004/02/19 21:49:33	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.130 2004/02/13 21:05:34 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.132 2004/02/19 21:49:33 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -385,22 +385,23 @@ sub get_table_sizes {
 	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;
+	    $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==2)) {$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;}
@@ -535,16 +536,14 @@ sub start_stringresponse {
 					    [['inline','Inline']],$token);
 	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
-	&Apache::edit::get_new_args($token,$parstack,
-				    $safeeval,'answer','type');
-	my $answerdisplay=$ENV{'form.'.&Apache::edit::html_element_name('answerdisplay')};
-	if ($answerdisplay) {
-	    $token->[2]->{'answerdisplay'}=$answerdisplay;
-	} else {
-	    delete $token->[2]->{'answerdisplay'};
-	}
-	$result = &Apache::edit::rebuild_tag($token);
-	$result.=&Apache::edit::handle_insert();
+       my $constructtag;
+       $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                 $safeeval,'answer',
+                                                 'type','answerdisplay');
+       if ($constructtag) {
+           $result = &Apache::edit::rebuild_tag($token);
+           $result.=&Apache::edit::handle_insert();
+       }
     } elsif ($target eq 'answer' || $target eq 'grade') {
 	&Apache::response::reset_params();
     }