--- loncom/homework/optionresponse.pm	2011/10/07 22:39:59	1.181
+++ loncom/homework/optionresponse.pm	2012/06/25 10:36:00	1.186
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.181 2011/10/07 22:39:59 raeburn Exp $
+# $Id: optionresponse.pm,v 1.186 2012/06/25 10:36:00 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,13 +203,15 @@ sub end_foilgroup {
 					     -2,0);
     my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
     my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');
+    my $noprompt       =&Apache::lonxml::get_param('noprompt', $parstack, $safeeval);
+
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 					       $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {
-      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt);
+      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt, @opt);
       $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
@@ -282,7 +284,7 @@ sub end_foilgroup {
 	  }
 	}
 	my $part=$Apache::inputtags::part;
-        my $nonlenient=&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);
@@ -386,18 +388,18 @@ sub end_foilgroup {
   return $result;
 }
 
-sub is_nonlenient {
+sub grading_is_nonlenient {
     my ($part) = @_;
-# Web mode: we are non-lenient unless told otherwise 
+# 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 
+# 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);  
+    my $lenientparm =
+        &Apache::response::get_response_param($part,'lenient',$defaultparm);
     if ($lenientparm=~/^0|off|no$/i) {
         $nonlenient = 1;
     } elsif ($lenientparm=~/^1|on|yes$/i) {
@@ -485,7 +487,8 @@ sub check_for_invalid {
 }
 
 sub displayfoils {
-  my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_;
+  my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
+      $tex_option_switch, $no_tfprompt, @opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
@@ -495,7 +498,9 @@ sub displayfoils {
   my $displayoptionintex=1;
   my @alphabet = ('A'..'Z');
   my @whichopt = &whichfoils($max,$randomize);
-  &check_for_invalid(\@whichopt,\@opt);
+  unless (($target eq 'tex') && ($tex_option_switch eq 'nochoice')) {
+      &check_for_invalid(\@whichopt,\@opt);
+  }
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
   my $break;
@@ -549,7 +554,7 @@ sub displayfoils {
     }
     my $internal_counter=$Apache::lonxml::counter;
     my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
-    if ($checkboxopt) {
+    if ($checkboxopt && (!$no_tfprompt)) {
        $result.='<br />'.
                 ($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').
                  &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
@@ -803,7 +808,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) {