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

[sakharuk]

sakharuk		Wed Jun 30 13:32:47 2004 EDT

  Modified files:              
    /loncom/homework/caparesponse	caparesponse.pm 
  Log:
  Bug 3059 (Printing numerical exam problems puts choices in two rows for one column printing) is fixed. I did not take into account the simplest case from the very beginning. Sorry.
  
  
Index: loncom/homework/caparesponse/caparesponse.pm
diff -u loncom/homework/caparesponse/caparesponse.pm:1.150 loncom/homework/caparesponse/caparesponse.pm:1.151
--- loncom/homework/caparesponse/caparesponse.pm:1.150	Tue Jun 29 18:42:50 2004
+++ loncom/homework/caparesponse/caparesponse.pm	Wed Jun 30 13:32:46 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.150 2004/06/29 22:42:50 albertel Exp $
+# $Id: caparesponse.pm,v 1.151 2004/06/30 17:32:46 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -412,7 +412,9 @@
 	$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;}
+    if ($bubbles_per_line > $number_of_bubbles) {
+	$bubbles_per_line=$number_of_bubbles;
+    }elsif (($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;}