--- loncom/homework/optionresponse.pm	2008/12/11 01:59:01	1.151.2.1
+++ loncom/homework/optionresponse.pm	2009/05/04 13:42:50	1.158
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.151.2.1 2008/12/11 01:59:01 raeburn Exp $
+# $Id: optionresponse.pm,v 1.158 2009/05/04 13:42:50 onken Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,6 +25,11 @@
 #
 # http://www.lon-capa.org/
 #
+
+
+
+
+
 package Apache::optionresponse;
 use strict;
 use Apache::response();
@@ -161,8 +166,12 @@ ENDTABLE
     } # 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} ';
+    } else {
+      $result .= "\\\\";
+    }
   }
   return $result;
 }
@@ -292,7 +301,11 @@ sub end_foilgroup {
     $result.=&Apache::edit::end_table();
   }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+    if($env{'form.pdfFormFields'} ne 'yes') {
       $result .= '\end{enumerate}';
+    } else {
+      $result .= "\\\\";
+    }
   }
   &Apache::response::poprandomnumber();
   return $result;
@@ -425,13 +438,30 @@ sub displayfoils {
       }
       my $lastopt=$lastresponse{$name};
       my $optionlist="<option></option>\n";
+
+      if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes'
+         && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+          my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp;
+          $optionlist =  &Apache::lonxml::print_pdf_start_combobox($fieldname);
+      }
+
       foreach my $option (@opt) {
 	  my $escopt=&HTML::Entities::encode($option,'\'"&<>');
-	  if ($option eq $lastopt) {
-	      $optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n";
-	  } else {
-	      $optionlist.="<option value='".$escopt."'>$option</option>\n";
-	  }
+          if ($option eq $lastopt) {
+              if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+                  && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+                  $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+              } else {
+                  $optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n";
+              }
+          } else {
+              if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+                  && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+                  $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+              } else {
+                  $optionlist.="<option value='".$escopt."'>$option</option>\n";
+              }
+          }
       }
       if ($target ne 'tex') {
 	  if ($Apache::lonhomework::type ne 'exam') {
@@ -469,13 +499,18 @@ sub displayfoils {
 	  if ($text=~m/\\item /) {
 	      if ($Apache::lonhomework::type eq 'exam') {
 	          $text=~s/\\item/\\vskip 2 mm/;
-	      }
-	      $result.= $texoptionlist.$text;
-	  } else {
+	      } elsif ($env{'form.pdfFormFields'} ne 'yes') {
+                  $result.= $texoptionlist.$text;
+              }
+          } else {
 	      if ($Apache::lonhomework::type eq 'exam') {
 		  $result.= $texoptionlist.'  '.$text;
-	      } else {
-		  if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;}
+	      } elsif ($env{'form.pdfFormFields'} ne 'yes') {
+		  if ($text=~/\S/) {
+                      $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;
+                  } else {
+                      $result.= $texoptionlist;
+                  }
 	      }
 	  }
 	  if ($Apache::lonhomework::type eq 'exam') {
@@ -484,6 +519,12 @@ sub displayfoils {
 		  '\end{enumerate} \vskip -8 mm \strut ';
 	      $internal_counter++;
 	  }
+          if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+              && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+              $text =~ s/\\item//m;
+              $result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\';
+              $temp++;
+          }
 	  $displayoptionintex=0;
       }
     }
@@ -743,3 +784,64 @@ sub insert_drawoptionlist {
 1;
 __END__
  
+=head1 NAME
+
+Apache::optionresponse.pm;
+
+=head1 SYNOPSIS
+
+Handles tags associated with showing a list of
+options.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+start_optionresponse()
+
+=head1 OTHER SUBROUTINES
+
+=over
+
+=item end_optionresponse()
+
+=item start_foilgroup()
+
+=item end_foilgroup()
+
+=item getfoilcounts()
+
+=item displayanswers()
+
+=item check_for_invalid()
+
+=item displayfoils()
+
+=item optionlist_correction()
+
+=item webbubbles()
+
+=item bubbles()
+
+=item start_conceptgroup()
+
+=item end_conceptgroup()
+
+=item insert_conceptgroup()
+
+=item start_foil()
+
+=item end_foil()
+
+=item start_drawoptionlist()
+
+=item end_drawoptionlist()
+
+=item insert_foil()
+
+=item insert_drawoptionlist()
+
+=back
+
+=cut