--- loncom/homework/optionresponse.pm	2001/12/14 23:00:52	1.29
+++ loncom/homework/optionresponse.pm	2002/01/25 16:12:18	1.33
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.29 2001/12/14 23:00:52 albertel Exp $
+# $Id: optionresponse.pm,v 1.33 2002/01/25 16:12:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,11 +26,12 @@
 # http://www.lon-capa.org/
 #
 # 2/21 Guy
+# 01/18 Alex
 package Apache::optionresponse;
 use strict;
 use Apache::response;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
 }
 
@@ -43,12 +44,15 @@ sub start_optionresponse {
   my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).
-      "<tr><td>Multiple Option Response Question</td><td>Delete:".
+	"<tr><td>Multiple Option Response Question</td><td>Delete:".
 	&Apache::edit::deletelist($target,$token)
-	  ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";
-    $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
-      "</td></tr>";
-    $result.="<tr><td colspan=\"3\">\n";
+	."</td><td>&nbsp;".
+        &Apache::edit::end_row().
+        &Apache::edit::start_spanning_row().
+        "\n";
+    $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
+        &Apache::edit::end_row().
+	&Apache::edit::start_spanning_row();
   }
   if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -58,6 +62,7 @@ sub start_optionresponse {
   if ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');
   }
+#  if ($target eq 'tex') {$result .= '\begin{itemize}';}
   return $result;
 }
 
@@ -68,6 +73,7 @@ sub end_optionresponse {
   &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+#  if ($target eq 'tex') {$result .= '\end{itemize}';}
   return $result;
 }
 
@@ -98,10 +104,10 @@ sub start_foilgroup {
         </td>
         <td>Delete an Option:
 	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
-        </td>
-     </tr>
-     <tr><td colspan="3">$insertlist<br />
 ENDTABLE
+    $result.= &Apache::edit::end_row();
+    $result.= &Apache::edit::start_spanning_row();
+    $result.= $insertlist.'<br />';
   }
   if ($target eq 'modified') {
     my @options;
@@ -133,6 +139,7 @@ ENDTABLE
       $result.=')">';
     } # else nothing changed so just use the default mechanism
   }
+  if ($target eq 'tex') {$result .= '\begin{itemize}';}
   return $result;
 }
 
@@ -140,7 +147,7 @@ sub end_foilgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $result;
-  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     my $name;
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max } 
@@ -148,8 +155,8 @@ sub end_foilgroup {
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
     &Apache::lonxml::debug("Options are $#opt");
-    if ($target eq 'web') {
-      $result.=&displayfoils($count,@opt);
+    if ($target eq 'web' || $target eq 'tex') {
+      $result.=&displayfoils($target,$count,@opt);
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($count,@opt);
     } elsif ( $target eq 'grade') {
@@ -195,7 +202,8 @@ sub end_foilgroup {
     }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
-  }
+  }  
+  if ($target eq 'tex') {$result .= '\end{itemize}';}
   return $result;
 }
 
@@ -236,19 +244,25 @@ sub displayanswers {
 }
 
 sub displayfoils {
-  my ($max,@opt)=@_;
+  my ($target,$max,@opt)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
   my @falselist;
   my $result;
   my $name;
+  $Apache::optionresponse::displayoptionintex=0;
   my @whichopt = &whichfoils($max);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
   if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/)  || ($Apache::inputtags::status[-1] eq  'SHOW_ANSWER')) {
     foreach $name (@whichopt) {
-      $result.="<br />".$Apache::response::foilgroup{$name.'.value'}.
-	":".$Apache::response::foilgroup{$name.'.text'}."\n";
+      if ($target eq 'web') {
+	  $result.="<br />";
+      } elsif ($target eq 'tex') {
+	$result.='\newline';
+      }
+      $result .=$Apache::response::foilgroup{$name.'.value'}.
+	  ":".$Apache::response::foilgroup{$name.'.text'}."\n";
     }
   } else {
     my $temp=1;
@@ -264,13 +278,32 @@ sub displayfoils {
 	  $optionlist.="<option>$option</option>\n";
 	}
       }
-      $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
-	.$optionlist
-	  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
-      $temp++;
+      if ($target ne 'tex') {
+	  $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">"
+	      .$optionlist
+		  ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n";
+	  $temp++;
+      } else {
+	  if ($Apache::optionresponse::displayoptionintex == 0) {
+              my $durtyoptionlist = $optionlist;
+	      $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/;
+	      $durtyoptionlist =~ s/<option>/{\\bf /g;
+	      $durtyoptionlist =~ s/<\/option>/},/g;
+	      $durtyoptionlist =~ s/,$/\./g;
+	      $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'};
+	      $Apache::optionresponse::displayoptionintex=1;
+	  } else {
+	      $result.= $Apache::response::foilgroup{$name.'.text'};
+	  }
+      } 
     }
+  } 
+  if ($target ne 'tex') {
+      return $result."<br />";
+  }
+  else {
+      return $result;
   }
-  return $result."<br />";
 }
 
 
@@ -281,8 +314,8 @@ sub start_conceptgroup {
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
-    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
-    $result.="<tr><td colspan=\"3\">\n";
+    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   }
   if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
@@ -295,7 +328,8 @@ sub end_conceptgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::optionresponse::conceptgroup=0;
   my $result='';
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'
+      || $target eq 'tex') {
     #if not there aren't any foils to display and thus no question
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
@@ -323,7 +357,7 @@ sub insert_conceptgroup {
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'tex') {
     &Apache::lonxml::startredirection;
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
@@ -333,11 +367,12 @@ sub start_foil {
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
-    $result .= '</td></tr><tr><td colspan="3">';
+    $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-  }
+  } 
+  if ($target eq 'tex') {$result .= '\item ';}
   return $result;
 }
 
@@ -345,8 +380,11 @@ sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text ='';
   my $result = '';
-  if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+  if ($target eq 'web' || $target eq 'tex') { 
+      $text=&Apache::lonxml::endredirection; 
+  }
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
+      || $target eq 'tex') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);