--- loncom/homework/optionresponse.pm	2002/10/17 14:30:40	1.51
+++ loncom/homework/optionresponse.pm	2002/10/28 14:27:27	1.56
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.51 2002/10/17 14:30:40 sakharuk Exp $
+# $Id: optionresponse.pm,v 1.56 2002/10/28 14:27:27 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -321,7 +321,8 @@ sub displayfoils {
 	  $result .=$Apache::response::foilgroup{$name.'.value'}.
 	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
       } else {
- 	  $result .='\item '.$Apache::response::foilgroup{$name.'.value'}.
+	  $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
+ 	  $result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'.
 	      ":".$Apache::response::foilgroup{$name.'.text'}."\n";
       }
     }
@@ -363,9 +364,9 @@ sub displayfoils {
 		  $result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
 	      } else {
 		  if ($Apache::lonhomework::type eq 'exam') {
-		      $result.= $texoptionlist.'\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+		      $result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
 		  } else {
-		      $result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'};
+		      $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
 		  }
 	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
@@ -426,7 +427,7 @@ sub bubbles {
     my $current_length = 0;
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
 	$current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
-	if ($current_length<80 and $ind!=$number_of_bubbles) {
+	if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) {
 	    $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
 	    $head.='lr';
 	} else {
@@ -438,10 +439,7 @@ sub bubbles {
 	}
 
     }
-    $Apache::lonxml::counter++;
-    my %moreenv;
-    $moreenv{'form.counter'}=$Apache::lonxml::counter;
-    &Apache::lonnet::appenv(%moreenv);
+    &Apache::lonxml::increment_counter();
     return $result;
 }
 
@@ -548,7 +546,7 @@ sub end_foil {
   my $result = '';
   if ($target eq 'web' || $target eq 'tex') { 
       $text=&Apache::lonxml::endredirection;
-      if ($target eq 'tex') { $text = '\item '.$text; }
+      if ($target eq 'tex') { $text = '\vspace*{-2 mm}\item '.$text; }
   }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {