--- loncom/homework/optionresponse.pm	2004/03/15 22:09:52	1.104
+++ loncom/homework/optionresponse.pm	2004/04/23 21:37:41	1.108
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.104 2004/03/15 22:09:52 albertel Exp $
+# $Id: optionresponse.pm,v 1.108 2004/04/23 21:37:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,10 +56,14 @@ sub start_optionresponse {
 				     $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order','randomize',
 				  ['yes','no'],$token).
+        &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
+				  [['horizontal',&mt('Normal list')],
+				   ['vertical',&mt('Listed in a vertical column')]],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						 $safeeval,'max','randomize');
+						 $safeeval,'max','randomize',
+						 'TeXlayout');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('optionresponse');
@@ -159,13 +163,15 @@ sub end_foilgroup {
     my $name;
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
+					     -2,0);
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 					       $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {
-      $result.=&displayfoils($target,$max,$randomize,@opt);
+      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
     } elsif ( $target eq 'analyze') {
@@ -284,8 +290,29 @@ sub displayanswers {
   return $result;
 }
 
+sub check_for_invalid {
+    my ($names,$options) = @_;
+    my %bad_names;
+    foreach my $name (@{ $names }) {
+	my $value=$Apache::response::foilgroup{$name.'.value'};
+	my $found=0;
+	foreach my $option (@{ $options }) {
+	    if ($value eq $option) { $found=1; }
+	}
+	if (!$found) { $bad_names{$name}=$value; }
+    }
+    if (%bad_names) {
+	my $error=&mt('The question can not be gotten correct, '.
+	    'the following foils in the <optionresponse> '.
+	    'have invalid correct options').' <br /><tt>'.
+	    join('<br />',(map { $_=&mt("[_1] with value [_2]",$_,$bad_names{$_}) } (keys(%bad_names)))).
+	    "</tt>";
+	&Apache::lonxml::error($error);
+    }
+}
+
 sub displayfoils {
-  my ($target,$max,$randomize,@opt)=@_;
+  my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
@@ -295,6 +322,7 @@ sub displayfoils {
   my $displayoptionintex=1;
   my @alphabet = ('A'..'Z');
   my @whichopt = &whichfoils($max,$randomize);
+  &check_for_invalid(\@whichopt,\@opt);
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
   my $break;
@@ -375,7 +403,7 @@ sub displayfoils {
 	  my $texoptionlist='';
 	  if ($displayoptionintex &&
 	      $Apache::lonhomework::type ne 'exam') {
-	      $texoptionlist = &optionlist_correction(@opt);
+	      $texoptionlist = &optionlist_correction($TeXlayout,@opt);
 	  }
 	  if ($text=~/<drawoptionlist\s*\/>/) {
 	      $text=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |;
@@ -390,7 +418,7 @@ sub displayfoils {
 	      if ($Apache::lonhomework::type eq 'exam') {
 		  $result.= $texoptionlist.'  '.$text;
 	      } else {
-		  $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;
+		  if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;}
 	      }
 	  }
 	  if ($Apache::lonhomework::type eq 'exam') {
@@ -412,18 +440,24 @@ sub displayfoils {
 
 
 sub optionlist_correction {
-    my @options = @_;
+    my ($TeXlayout,@options) = @_;
     my $texoptionlist='\\item [] Choices: ';
+    if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}
     if (scalar(@options) > 0) {
 	foreach my $option (@options) {
 	    $texoptionlist.='{\bf '.
 		&Apache::lonxml::latex_special_symbols($option).
-		'},';
+		'}';
+	    if ($TeXlayout eq 'vertical') {
+		$texoptionlist.=' \vskip 0 mm ',
+	    } else {
+		$texoptionlist.=',';
+	    }
 	}
 	chop($texoptionlist);
-	$texoptionlist.='.';
+	if ($TeXlayout ne 'vertical') {$texoptionlist.='.';}
     } else {
-	$texoptionlist='\\item [] \\vskip -5 mm';
+	if ($TeXlayout ne 'vertical') {$texoptionlist='\\item [] \\vskip -5 mm';}
     }
     return $texoptionlist;
 }
@@ -476,7 +510,7 @@ sub bubbles {
 	    $head.='lr';
 	} else {
 	    $line=~s/\&\s*$//;
-	    $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}';
+	    $result.='\vskip -2 mm\noindent\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
 	    $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;
@@ -530,7 +564,10 @@ sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' ) {
-    &Apache::lonxml::startredirection;
+      &Apache::lonxml::startredirection;
+      if ($target eq 'analyze') {
+	  &Apache::response::check_if_computed($token,$parstack,$safeeval,'value');
+      }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
     my $level='-2';
@@ -561,7 +598,8 @@ sub end_foil {
   my $result = '';
   if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
       $text=&Apache::lonxml::endredirection;
-      if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; }
+      $text=~/(\w)/;
+      if (($target eq 'tex') and ($Apache::lonhomework::type ne 'exam') and ($text=~/\S/)) {$text = '\vspace*{-2 mm}\item '.$text;} 
   }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {