--- loncom/homework/optionresponse.pm	2010/04/27 14:11:17	1.164
+++ loncom/homework/optionresponse.pm	2010/09/05 20:46:58	1.172
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.164 2010/04/27 14:11:17 onken Exp $
+# $Id: optionresponse.pm,v 1.172 2010/09/05 20:46:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,7 +137,10 @@ ENDTABLE
        }
        $result.='>'.$option.'</option>';
     }
-    $result.='</select></label>';  
+    $result.='</select></label>';
+    $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
+                                         [ ['nochoice','Don\'t show option list'] ]
+                                         ,$token).'</td>';
     $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();
     $result.= $insertlist.'<br />';
@@ -162,7 +165,7 @@ ENDTABLE
       $optchanged=1;
     }
     my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
-						 'texoptions','checkboxvalue');
+						 'texoptions','checkboxvalue','checkboxoptions');
     if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
@@ -173,14 +176,14 @@ ENDTABLE
       chop $result;
       $result.=')" ';
       $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
+      $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
       $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
       $result .= '>';
     } # else nothing changed so just use the default mechanism
   }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
     if($env{'form.pdfFormFields'} ne 'yes') {
-      $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
-                   \begin{enumerate} ';
+      $result .= ' \begin{itemize} ';
     } else {
       $result .= "\\\\";
     }
@@ -203,13 +206,14 @@ sub end_foilgroup {
     my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
 					     -2,0);
     my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
+    my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');
     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,@opt);
+      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt);
       $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
@@ -327,7 +331,7 @@ sub end_foilgroup {
   }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
     if($env{'form.pdfFormFields'} ne 'yes') {
-      $result .= '\end{enumerate}';
+      $result .= '\end{itemize}'; 
     } else {
       $result .= "\\\\";
     }
@@ -415,7 +419,7 @@ sub check_for_invalid {
 }
 
 sub displayfoils {
-  my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,@opt)=@_;
+  my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
@@ -452,7 +456,9 @@ sub displayfoils {
 		    $text='<b>'.$value.':</b> '.$text;
 		}
 	    } else {
-		$text='&#149;'.$text;
+                if (@whichopt > 1) {
+                    $text='&#149;'.$text;
+                }
 	    }
 	    $result.=$text."\n";
 	}
@@ -467,8 +473,9 @@ sub displayfoils {
     my $internal_counter=$Apache::lonxml::counter;
     my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
     if ($checkboxopt) {
-       $result.='<br />'.&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. '.
-                &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
+       $result.='<br />'.
+                ($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').
+                 &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
     }
     foreach $name (@whichopt) {
       my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -543,7 +550,9 @@ sub displayfoils {
 	  }
 	  if ($text=~s|<drawoptionlist\s*/>|$optionlist|) {
 	      if ($Apache::lonhomework::type ne 'exam') {
-		  $text='&#149;'.$text;
+                  if (@whichopt > 1) {  
+                      $text='&#149;'.$text;
+                  }
 	      }
 	  } else {
 	      if ($Apache::lonhomework::type ne 'exam') {
@@ -583,9 +592,9 @@ sub displayfoils {
 	      }
 	  }
 	  if ($Apache::lonhomework::type eq 'exam') {
-	      $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.
-		  $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).
-		  '\end{enumerate} \vskip -8 mm \strut ';
+	      $result.='\vskip -1 mm\noindent';
+              $result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt).
+		                 ' \strut ';
 	      $internal_counter++;
 	  }
           if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
@@ -692,12 +701,12 @@ sub bubbles {
 
 	$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
 	if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
-	    $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
+	    $line.='\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
 	    $head.='lr';
 	} else {
 	    $line=~s/\&\s*$//;
-	    $result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
-	    $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
+	    $result.='\vskip -1 mm\noindent\setlength{\tabcolsep}{2 mm}\renewcommand{\arraystretch}{1.25}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
+	    $line = '\hskip 4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
 	    $head ='lr';
 	    $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
 	}