--- loncom/homework/optionresponse.pm	2004/02/19 19:20:25	1.96.2.2
+++ loncom/homework/optionresponse.pm	2004/01/06 20:37:29	1.97
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.96.2.2 2004/02/19 19:20:25 albertel Exp $
+# $Id: optionresponse.pm,v 1.97 2004/01/06 20:37:29 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -397,7 +397,7 @@ 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 -9 mm \strut ';
+		  $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
 		  $internal_counter++;
 	      }
 	      $displayoptionintex=1;
@@ -418,7 +418,7 @@ 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 -9 mm \strut ';
+		  $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -9 mm \strut ';
 		  $internal_counter++;
 	      }
 	  }
@@ -445,7 +445,7 @@ sub optionlist_correction {
 	$texoptionlist =~ s/>/\$>\$/g;
 	$texoptionlist =~ s/</\$<\$/g;
 	$texoptionlist =~ s/=/\$=\$/g;
-	$texoptionlist =~ s/\^(\d+)/<m>\$$1\$<\/m>/g;
+	$texoptionlist =~ s/\^(\d+)/\$^{$1}\$/g;
     } else {
 	$texoptionlist =~ s/<option><\/option>/\\item \[\] \\vskip -5 mm/;
     }
@@ -484,25 +484,14 @@ sub bubbles {
     my ($result,$head,$line) =('','','');
     my $number_of_bubbles = $#opt + 1;
     my $current_length = 0;
-    my $textwidth;
-    if ($ENV{'form.textwidth'} ne '') {
-	$ENV{'form.textwidth'}=~/(\d+)/;
-	$textwidth=$1;
-    } else {
-	$ENV{'textwidth'}=~/(\d+)/;
-	$textwidth=$1;
-    }
     for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
-	my $leftmargin;
-	$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
-	if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
-	$current_length += (length($opt[$ind])+length($alphabet[$ind])+3)*2;
-	if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
+	$current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2;
+	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 {
 	    $line=~s/\&\s*$//;
-	    $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}';
+	    $result.='\vskip -5 mm\begin{tabular}{'.$head.'}\\\\'.$line.'\\\\\end{tabular}';
 	    $line = '\hskip -1 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;