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

[sakharuk]

sakharuk		Wed Mar 26 13:43:15 2003 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  Changes were done according to Ed's desires: 1. Added righttriangle symbol yo any foil in the exam LaTeX mode (lines before bubbles). 2. Spacing adjustment of the text and bubbles is done. 3. Separation of problems with respect to foils (questions) is more clear now.
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.13 loncom/homework/matchresponse.pm:1.14
--- loncom/homework/matchresponse.pm:1.13	Tue Mar 25 17:21:20 2003
+++ loncom/homework/matchresponse.pm	Wed Mar 26 13:43:15 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.13 2003/03/25 22:21:20 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.14 2003/03/26 18:43:15 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@
 use Math::Random();
 use Apache::optionresponse;
 
+my $flag_for_exam_printing = 1;
 my @Items = ();
 
 BEGIN {
@@ -422,7 +423,7 @@
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#Items;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@Items_letter,\@emptyItems).'}\end{enumerate}} \vskip -3 mm \strut ';
+		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@Items_letter,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
 	        } else {
 		    $question.=' \\\\ '.$optionlist.$text."\n";
 		}
@@ -611,12 +612,24 @@
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
-		$Apache::response::conceptgroup{"$name.text"} = $text;
+		if ($target eq 'tex') {
+		    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		} else {
+		    $Apache::response::conceptgroup{"$name.text"} = $text;
+		}
 		$Apache::response::conceptgroup{"$name.location"} = $location;
 	    } else {
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
-		$Apache::response::foilgroup{"$name.text"} = $text;
+		if ($Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) {
+		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		} else {
+		    if ($target eq 'tex') {
+			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		    } else {
+			$Apache::response::foilgroup{"$name.text"} = $text;
+		    }
+		}
 		$Apache::response::foilgroup{"$name.location"} = $location;
 	    }
 	}