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

[sakharuk]

sakharuk		Mon Jun 30 16:23:33 2003 EDT

  Modified files:              
    /loncom/homework	matchresponse.pm 
  Log:
  Changes to print huge problems (no room on single page). Instead table environment module use list-description environment. That allow to avoid a lot of problems (conflicts between dif LaTeX envs).
  
  
Index: loncom/homework/matchresponse.pm
diff -u loncom/homework/matchresponse.pm:1.18 loncom/homework/matchresponse.pm:1.19
--- loncom/homework/matchresponse.pm:1.18	Fri May 16 16:16:18 2003
+++ loncom/homework/matchresponse.pm	Mon Jun 30 16:23:33 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Full matching style response
 #
-# $Id: matchresponse.pm,v 1.18 2003/05/16 20:16:18 albertel Exp $
+# $Id: matchresponse.pm,v 1.19 2003/06/30 20:23:33 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -144,16 +144,16 @@
 	$table.='</table>';
 	$Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {
-	my $table=' \\\\\\\\ \begin{tabular}{ll} ';
+	my $table=' \\\\\\\\ \begin{description} ';
 	my $i=0;
 	foreach my $name (@names) {
 	    $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
-	    $table.=' '.$alphabet[$i].' & '.
+	    $table.='\item['.$alphabet[$i].'] '.
 		$Apache::response::itemgroup{$name.'.text'}.
 		    ' \\\\ ';
 	    $i++;
 	}
-	$table.=' \end{tabular} \\\\ ';
+	$table.=' \end{description} \strut \\\\ ';
 	$Apache::matchresponse::itemtable{'display'}=$table;
     }
     return $result;
@@ -408,16 +408,20 @@
 		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
 		}
 	    }
-	    if ($target ne 'tex') {
+	    if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
 	        $optionlist='<select name="HWVAL_'.
 		    $Apache::inputtags::response[-1].':'.$temp.'">'.
 		        $optionlist."</select>\n";
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
-		$question.='<br />'.$optionlist.$text."\n";
+		if ($Apache::lonhomework::type ne 'exam') {
+		    $question.='<br />'.$optionlist.$text."\n";
+		} else {
+		    $question.='<br />'.$text."\n";
+		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters);
+		    $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp);
 		}
 	    } else {		
 		if ($Apache::lonhomework::type eq 'exam') {
@@ -567,7 +571,7 @@
 		 && !&Apache::response::showallfoils() ) {
 		push @{ $Apache::response::conceptgroup{'names'} }, $name;
 		$Apache::response::conceptgroup{"$name.value"} = $value;
-		if ($target eq 'tex') {
+		if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
 		    $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
 		} else {
 		    $Apache::response::conceptgroup{"$name.text"} = $text;
@@ -577,7 +581,11 @@
 		push @{ $Apache::response::foilgroup{'names'} }, $name;
 		$Apache::response::foilgroup{"$name.value"} = $value;
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		    if ($target eq 'tex') {
+			$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		    } else {
+			$Apache::response::foilgroup{"$name.text"} = $text;
+		    }
 		} else {
 		    if ($target eq 'tex') {
 			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;