--- loncom/homework/rankresponse.pm	2003/03/19 14:23:38	1.4
+++ loncom/homework/rankresponse.pm	2003/04/02 20:23:52	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.4 2003/03/19 14:23:38 sakharuk Exp $
+# $Id: rankresponse.pm,v 1.12 2003/04/02 20:23:52 sakharuk Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -250,7 +250,8 @@ sub displayfoils {
 	my $id=$Apache::inputtags::response[-1];
 	my $part=$Apache::inputtags::part;
 	my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
-	my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
+	my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
+	my @alp = splice @alphabet, 0, $#whichopt + 1;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $optionlist='';
@@ -263,7 +264,7 @@ sub displayfoils {
 		    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";
@@ -272,23 +273,26 @@ sub displayfoils {
 	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
-		$result.='<br />'.$optionlist.$text."\n";
+		if ($Apache::lonhomework::type ne 'exam') {
+		    $result.='<br />'.$optionlist.$text."\n";
+		} else {
+		    $result.='<br />'.$text."\n";
+		}
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.=&Apache::optionresponse::webbubbles(\@alphabet,\@whichopt);
+		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp);
 		}
 	    } else {
 		if ($Apache::lonhomework::type eq 'exam') {
-		    $result.=' \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
-		    $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.&Apache::optionresponse::bubbles(\@alphabet,\@whichopt).'\end{enumerate}\strut ';
-		    &Apache::lonxml::increment_counter();
+		    $result.='\vskip 0 mm   '.$text.' \vskip -3 mm '."\n";
+		    $result.='\vskip -5 mm\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@alp,\@whichopt).'}\end{enumerate} \vskip -5 mm \strut ';
 		} else {
-		$result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+		    $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
 		}
 	    }
 	    $temp++;
 	}
     }
-    if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
+    if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
     return $result;
 }
 
@@ -375,7 +379,7 @@ sub end_conceptgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     $Apache::rankresponse::conceptgroup=0;
     my $result='';
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
 	#if not there aren't any foils to display and thus no question
 	if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
 	    my @names = @{ $Apache::response::conceptgroup{'names'} };
@@ -392,7 +396,7 @@ sub end_conceptgroup {
 						     $safeeval);
 	    $Apache::response::foilgroup{"$name.concept"} = $concept;
 	    &Apache::lonxml::debug("Selecting $name in $concept");
-	    if ($target eq 'web') {
+	    if ($target eq 'web' || $target eq 'tex') {
 		my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 		push(@{ $Apache::hint::rank{"$part_id.concepts"} },
 		     $concept);
@@ -457,12 +461,24 @@ sub end_foil {
 		 && !&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' and $Apache::lonhomework::type eq 'exam') {
+		    $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 ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		} else {
+		    if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
+			$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;
+		    } else {
+			$Apache::response::foilgroup{"$name.text"} = $text;
+		    } 
+		}
 		$Apache::response::foilgroup{"$name.location"} = $location;
 	    }
 	}