--- loncom/homework/radiobuttonresponse.pm	2007/04/17 23:25:09	1.114
+++ loncom/homework/radiobuttonresponse.pm	2007/06/20 22:36:52	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.114 2007/04/17 23:25:09 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.118 2007/06/20 22:36:52 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,9 @@ use strict;
 use HTML::Entities();
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::response;
+
+my $bubbles_per_line = 10;
 
 BEGIN {
     &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse'));
@@ -39,6 +42,7 @@ BEGIN {
 sub start_radiobuttonresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+
     #when in a radiobutton response use these
     &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
     push (@Apache::lonxml::namespace,'radiobuttonresponse');
@@ -142,11 +146,26 @@ sub grade_response {
     my ($answer,@whichfoils)=&whichfoils($max,$randomize);
     if ( !&Apache::response::submitted() ) { return; }
     my $response;
+    
+    # Need to know how many foils we have so that I know how many
+    # bubble lines to consume:
+    
+    my $numfoils = scalar @whichfoils;
+    my $bubble_lines = int($numfoils / $bubbles_per_line);
+    if (($numfoils % $bubbles_per_line) != 0) {
+	$bubble_lines++;	# Partial line of bubbles too.
+    }
+    
+    
     if ($env{'form.submitted'} eq 'scantron') {
-	$response=&Apache::response::getresponse();
+	$response = &Apache::response::getresponse(1,undef,$bubble_lines,
+						 $bubbles_per_line);
+
     } else {
 	$response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
     }
+    &Apache::lonxml::increment_counter($bubble_lines-1);
+
     if ( $response !~ /[0-9]+/) { return; }
     my $part=$Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];
@@ -509,6 +528,7 @@ sub displayfoils {
     } else {
 	my @alphabet = ('A'..'Z');
 	my $i = 0;
+	my $bubble_number = 0;
 	my $temp=0;  
 	my $id=$Apache::inputtags::response['-1'];
 	my $part=$Apache::inputtags::part;
@@ -538,6 +558,13 @@ sub displayfoils {
 		if ($Apache::lonhomework::type eq 'exam') {
 		    $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';  #' stupid emacs
 		    $i++;
+		    $bubble_number++;
+		    if($bubble_number >= $bubbles_per_line) {
+			$i = 0;
+			$bubble_number = 0;
+			&Apache::lonxml::increment_counter(1);
+			$result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+		    }
 		} else {
 		    $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
 		}