--- loncom/homework/optionresponse.pm	2011/11/29 13:24:38	1.183
+++ loncom/homework/optionresponse.pm	2012/04/18 19:45:39	1.185
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.183 2011/11/29 13:24:38 raeburn Exp $
+# $Id: optionresponse.pm,v 1.185 2012/04/18 19:45:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,6 @@
 
 package Apache::optionresponse;
 use strict;
-use Apache::inputtags();
 use Apache::response();
 use Apache::lonlocal;
 use Apache::lonnet;
@@ -283,7 +282,7 @@ sub end_foilgroup {
 	  }
 	}
 	my $part=$Apache::inputtags::part;
-        my $nonlenient=&Apache::inputtags::grading_is_nonlenient($part);
+        my $nonlenient=&grading_is_nonlenient($part);
 	my $id = $Apache::inputtags::response['-1'];
 	my $responsestr=&Apache::lonnet::hash2str(%responsehash);
 	my $gradestr   =&Apache::lonnet::hash2str(%grade);
@@ -387,6 +386,26 @@ sub end_foilgroup {
   return $result;
 }
 
+sub grading_is_nonlenient {
+    my ($part) = @_;
+# Web mode: we are non-lenient unless told otherwise
+    my $defaultparm = 'off';
+    my $nonlenient = 0;
+# Grading a bubblesheet exam: we are grading lenient unless told otherwise
+    if ($Apache::lonhomework::scantronmode) {
+        $defaultparm = 'on';
+        $nonlenient = 1;
+    }
+    my $lenientparm =
+        &Apache::response::get_response_param($part,'lenient',$defaultparm);
+    if ($lenientparm=~/^0|off|no$/i) {
+        $nonlenient = 1;
+    } elsif ($lenientparm=~/^1|on|yes$/i) {
+        $nonlenient = 0;
+    }
+    return $nonlenient;
+}
+
 sub getfoilcounts {
   my ($max)=@_;
   # +1 since instructors will count from 1
@@ -787,7 +806,7 @@ sub bubbles {
 	if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
 	if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
 
-	$current_length += (length($opt[$ind])+length($item)+4)*2;
+	$current_length += (length($opt[$ind])+length($item)+5)*2;
         
 	if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {