[LON-CAPA-cvs] cvs: loncom /homework/caparesponse caparesponse.pm

[sakharuk]

sakharuk		Thu Feb 26 11:36:48 2004 EDT

  Modified files:              
    /loncom/homework/caparesponse	caparesponse.pm 
  Log:
  Bug 2765 (numericalresponse sometimes still creates incorrect width tables) is fixed.
  
  
Index: loncom/homework/caparesponse/caparesponse.pm
diff -u loncom/homework/caparesponse/caparesponse.pm:1.134 loncom/homework/caparesponse/caparesponse.pm:1.135
--- loncom/homework/caparesponse/caparesponse.pm:1.134	Mon Feb 23 15:57:50 2004
+++ loncom/homework/caparesponse/caparesponse.pm	Thu Feb 26 11:36:48 2004
@@ -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.135 2004/02/26 16:36:48 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -384,7 +384,7 @@
 	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*)/) {
+	} elsif ($member=~/(\d*)\.(\d*)/) {
 	    $cell_width_real=(length($1)+length($2)+3)*$scale;
 	} else {
 	    $cell_width_real=(length($member)+1)*$scale;
@@ -401,7 +401,7 @@
 	$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;}