--- loncom/homework/rankresponse.pm 2003/03/19 18:18:54 1.5 +++ loncom/homework/rankresponse.pm 2003/03/27 16:55:31 1.11 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # rank style response # -# $Id: rankresponse.pm,v 1.5 2003/03/19 18:18:54 sakharuk Exp $ +# $Id: rankresponse.pm,v 1.11 2003/03/27 16:55:31 sakharuk Exp $ # Copyright Michigan State University Board of Trustees # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). @@ -279,9 +279,8 @@ sub displayfoils { } } 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(); + $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"; } @@ -376,7 +375,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'} }; @@ -393,7 +392,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); @@ -458,12 +457,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; } }