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

sakharuk lon-capa-cvs@mail.lon-capa.org
Thu, 08 Apr 2004 14:22:48 -0000


sakharuk		Thu Apr  8 10:22:48 2004 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  Bubbles do not overlap anymore in the exam mode. Additional space is saved.
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.39 loncom/homework/matchresponse.pm:1.40
--- loncom/homework/matchresponse.pm:1.39	Fri Apr  2 12:58:16 2004
+++ loncom/homework/matchresponse.pm	Thu Apr  8 10:22:48 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.39 2004/04/02 17:58:16 sakharuk Exp $
+# $Id: matchresponse.pm,v 1.40 2004/04/08 14:22:48 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,7 +161,8 @@
 		$Apache::response::itemgroup{$name.'.text'};
 	    $i++;
 	}
-	$table.=' \end{description} \strut ';
+	$table.=' \end{description}  \strut ';
+	if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
 	$Apache::matchresponse::itemtable{'display'}=$table;
     }
     return $result;
@@ -469,7 +470,7 @@
 		    $question.=' '.$optionlist.$text."\n";
 		    my @emptyItems = ();
 		    for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
-		    $question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';
+		    $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
 		    $internal_counter++;
 	        } else {
 		    $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";