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

[sakharuk]

sakharuk		Fri Apr 23 13:57:18 2004 EDT

  Modified files:              
    /loncom/homework	optionresponse.pm 
  Log:
  Added additional attribute TeXlayout to print complicated problems with a few
  <foilgroups> in text. See e-mail that I've sent you (copy e-mail to Ed). 
  
  
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.106 loncom/homework/optionresponse.pm:1.107
--- loncom/homework/optionresponse.pm:1.106	Fri Apr 16 18:25:13 2004
+++ loncom/homework/optionresponse.pm	Fri Apr 23 13:57:18 2004
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.106 2004/04/16 22:25:13 albertel Exp $
+# $Id: optionresponse.pm,v 1.107 2004/04/23 17:57:18 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -159,13 +159,15 @@
     my $name;
     my @opt;
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,undef,0);
+    &Apache::lonnet::logthis("PARAMETER U>$TeXlayout<U");
     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') {
@@ -306,7 +308,8 @@
 }
 
 sub displayfoils {
-  my ($target,$max,$randomize,@opt)=@_;
+  my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
+  &Apache::lonnet::logthis("PARAMETER >>$TeXlayout<<");
   if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @truelist;
@@ -397,7 +400,7 @@
 	  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\} |;
@@ -412,7 +415,7 @@
 	      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') {
@@ -434,18 +437,25 @@
 
 
 sub optionlist_correction {
-    my @options = @_;
+    my ($TeXlayout,@options) = @_;
+    &Apache::lonnet::logthis("PARAMETER >$TeXlayout<");
     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;
 }
@@ -498,7 +508,7 @@
 	    $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;
@@ -586,7 +596,9 @@
   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)/;
+      &Apache::lonnet::logthis("TTTEXT IS HERE NOW >>$text<< >>>$1<<<");
+      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') {