[LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm

[sakharuk]

sakharuk		Tue Mar 25 17:13:25 2003 EDT

  Modified files:              
    /loncom/homework	optionresponse.pm 
  Log:
   Corrected enumeration of bubble's lines for exam mode - now all numbers appear on the same line as bubbles themself.
  
  
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.67 loncom/homework/optionresponse.pm:1.68
--- loncom/homework/optionresponse.pm:1.67	Sun Jan 19 03:10:22 2003
+++ loncom/homework/optionresponse.pm	Tue Mar 25 17:13:25 2003
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.67 2003/01/19 08:10:22 albertel Exp $
+# $Id: optionresponse.pm,v 1.68 2003/03/25 22:13:25 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,7 @@
       $result.=')">';
     } # else nothing changed so just use the default mechanism
   }
-  if ($target eq 'tex') {
+  if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
       $result .= ' \begin{enumerate} ';
   }
   return $result;
@@ -230,7 +230,7 @@
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
   }  
-  if ($target eq 'tex') {$result .= '\end{enumerate}';}
+  if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {$result .= '\end{enumerate}';}
   return $result;
 }
 
@@ -401,7 +401,7 @@
 	      if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist
 	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
 		if ($Apache::lonhomework::type eq 'exam') {
-	          $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+	          $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\vskip 2 mm/;
 	        }
 	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
 	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
@@ -409,20 +409,19 @@
 		$result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'};
 	      } else {
 		  if ($Apache::lonhomework::type eq 'exam') {
-		      $result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+		      $result.= $texoptionlist.'  '.$Apache::response::foilgroup{$name.'.text'};
 		  } else {
 		      $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
 		  }
 	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $result.=&bubbles(\@alphabet,\@opt);
-		  $result.='\vskip 2 mm ';
+		  $result.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -3 mm \strut ';
 	      }
 	      $displayoptionintex=1;
 	  } else {
 	      if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) {
 		  if ($Apache::lonhomework::type eq 'exam') {
-		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/;
+		      $Apache::response::foilgroup{$name.'.text'}=~s/\\item//;
 		  }
 	        if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) {
 	          $Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
@@ -430,14 +429,13 @@
 		$result.= $Apache::response::foilgroup{$name.'.text'};
 	      } else {
 		  if ($Apache::lonhomework::type eq 'exam') {
-		      $result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'};
+		      $result.= '  '.$Apache::response::foilgroup{$name.'.text'};
 		  } else {
 		      $result.= '\item '.$Apache::response::foilgroup{$name.'.text'};
 		  }
 	      }
 	      if ($Apache::lonhomework::type eq 'exam') {
-		  $result.=&bubbles(\@alphabet,\@opt);
-		  $result.='\vskip 2 mm ';
+		  $result.='\vskip -2 mm \parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&bubbles(\@alphabet,\@opt).'}\end{enumerate}} \vskip -3 mm \strut ';
 	      }
 	  }
       }
@@ -618,7 +616,7 @@
   my $result = '';
   if ($target eq 'web' || $target eq 'tex') { 
       $text=&Apache::lonxml::endredirection;
-      if ($target eq 'tex') { $text = '\vspace*{-2 mm}\item '.$text; }
+      if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
   }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {