--- loncom/homework/rankresponse.pm	2003/03/17 20:08:21	1.3
+++ loncom/homework/rankresponse.pm	2003/03/26 18:43:29	1.9
@@ -1,8 +1,7 @@
 # The LearningOnline Network with CAPA
 # rank style response
 #
-# $Id: rankresponse.pm,v 1.3 2003/03/17 20:08:21 sakharuk Exp $
-#
+# $Id: rankresponse.pm,v 1.9 2003/03/26 18:43:29 sakharuk Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -30,6 +29,9 @@
 package Apache::rankresponse;
 use strict;
 use HTML::Entities();
+use Apache::optionresponse;
+
+my $flag_for_exam_printing = 1;
 
 BEGIN {
     &Apache::lonxml::register('Apache::rankresponse',('rankresponse'));
@@ -231,6 +233,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"};
@@ -249,8 +252,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 $localcount = 1;
+	my %lastresponse=&Apache::lonnet::str2hash($lastresponse); 
+	my @alp = splice @alphabet, 0, $#whichopt + 1;
 	foreach my $name (@whichfoils) {
 	    my $lastopt=$lastresponse{$name};
 	    my $optionlist='';
@@ -273,11 +276,21 @@ sub displayfoils {
 	    my $text=$Apache::response::foilgroup{$name.'.text'};
 	    if ($target ne 'tex') {
 		$result.='<br />'.$optionlist.$text."\n";
-	    } else {$result.=' \\\\ '.$localcount.'. '.$text."\n"; $localcount++;}
+		if ($Apache::lonhomework::type eq 'exam') {
+		    $result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt);
+		}
+	    } else {
+		if ($Apache::lonhomework::type eq 'exam') {
+		    $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";
+		}
+	    }
 	    $temp++;
 	}
     }
-    if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
+    if ($target ne 'tex') {$result.="<br />";} else {$result.=' \vskip 0 mm ';}
     return $result;
 }
 
@@ -364,7 +377,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'} };
@@ -381,7 +394,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);
@@ -446,12 +459,25 @@ 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') {
+		    $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' and $flag_for_exam_printing) {
+		    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
+		    $flag_for_exam_printing = 0;
+		} 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;
 	    }
 	}