--- loncom/homework/rankresponse.pm	2003/01/19 08:13:04	1.1
+++ loncom/homework/rankresponse.pm	2003/03/19 18:18:54	1.5
@@ -1,8 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.1 2003/01/19 08:13:04 albertel Exp $
-#
+# $Id: rankresponse.pm,v 1.5 2003/03/19 18:18:54 sakharuk Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -30,6 +29,7 @@
 package Apache::rankresponse;
 use strict;
 use HTML::Entities();
+use Apache::optionresponse;
 
 BEGIN {
     &Apache::lonxml::register('Apache::rankresponse',('rankresponse'));
@@ -91,15 +91,13 @@ sub start_foilgroup {
 sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
-	my $style = $Apache::lonhomework::type;
-	my $name;
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
 	my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
 	my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 						   $safeeval,'-2');
 	my $tol = &Apache::lonxml::get_param('tol',$parstack,$safeeval,'-2');
 	if (!defined($tol)) { $tol=0; }
-	if ($target eq 'web') {
+	if ($target eq 'web' || $target eq 'tex') {
 	    $result=&displayfoils($target,$max,$randomize,$tol);
 	} elsif ($target eq 'answer' ) {
 	    $result=&displayanswers($max,$randomize,$tol);
@@ -233,6 +231,7 @@ sub grade_response {
 sub displayfoils {
     my ($target,$max,$randomize,$tol)=@_;
     my $result;
+    my @alphabet=('A'..'Z');
     my (@whichfoils)=&whichfoils($max,$randomize);
     my $part=$Apache::inputtags::part;
     my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
@@ -251,27 +250,46 @@ 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="<option></option>\n";
+	    my $optionlist='';
+	    if ($target ne 'tex') {$optionlist="<option></option>\n";}
 	    my $option;
 	    foreach $option (@whichopt) {
 		if ($option eq $lastopt) {
-		    $optionlist.="<option selected=\"on\">$option</option>\n";
+		    if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}
 		} else {
-		    $optionlist.="<option>$option</option>\n";
+		    if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
 		}
 	    }
-	    $optionlist='<select name="HWVAL_'.
-		$Apache::inputtags::response[-1].':'.$temp.'">'.
-		    $optionlist."</select>\n";
+	    if ($target ne 'tex') {
+		$optionlist='<select name="HWVAL_'.
+		    $Apache::inputtags::response[-1].':'.$temp.'">'.
+		        $optionlist."</select>\n";
+	    } else {
+		$optionlist=' '.$temp.' '.$optionlist.' ';
+	    }
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
-	    $result.='<br />'.$optionlist.$text."\n";
+	    if ($target ne 'tex') {
+		$result.='<br />'.$optionlist.$text."\n";
+		if ($Apache::lonhomework::type eq 'exam') {
+		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt);
+		}
+	    } else {
+		if ($Apache::lonhomework::type eq 'exam') {
+		    $result.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\vskip 0 mm - '.$text."\n";
+		    $result.=&Apache::optionresponse::bubbles(\@alp,\@whichopt).'\end{enumerate} \vskip -7 mm \strut ';
+		    &Apache::lonxml::increment_counter();
+		} else {
+		    $result.=' \\\\ \framebox[5 mm][s]{\tiny\strut} '.$text."\n";
+		}
+	    }
 	    $temp++;
 	}
     }
-    $result.="<br />";
+    if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
     return $result;
 }
 
@@ -397,7 +415,7 @@ sub insert_conceptgroup {
 sub start_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    if ($target eq 'web' ) {
+    if ($target eq 'web' || $target eq 'tex') {
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::tag_start($target,$token,"Foil");
@@ -425,10 +443,10 @@ sub end_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $text ='';
     my $result = '';
-    if ($target eq 'web') {
+    if ($target eq 'web' || $target eq 'tex') {
 	$text=&Apache::lonxml::endredirection;
     }
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
 	my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
 	if ($value ne 'unused') {
 	    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);