version 1.51, 2002/10/17 14:30:40
|
version 1.56, 2002/10/28 14:27:27
|
Line 321 sub displayfoils {
|
Line 321 sub displayfoils {
|
$result .=$Apache::response::foilgroup{$name.'.value'}. |
$result .=$Apache::response::foilgroup{$name.'.value'}. |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
} else { |
} else { |
$result .='\item '.$Apache::response::foilgroup{$name.'.value'}. |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item//; |
|
$result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
} |
} |
} |
} |
Line 363 sub displayfoils {
|
Line 364 sub displayfoils {
|
$result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'}; |
$result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'}; |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.= $texoptionlist.'\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; |
$result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; |
} else { |
} else { |
$result.= $texoptionlist.'\item '.$Apache::response::foilgroup{$name.'.text'}; |
$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; |
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 426 sub bubbles {
|
Line 427 sub bubbles {
|
my $current_length = 0; |
my $current_length = 0; |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
$current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2; |
$current_length += (length($opt[$ind])+length($alphabet[$ind])+2)*2; |
if ($current_length<80 and $ind!=$number_of_bubbles) { |
if ($current_length<0.9*$ENV{'form.textwidth'} and $ind!=$number_of_bubbles) { |
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & '; |
$head.='lr'; |
$head.='lr'; |
} else { |
} else { |
Line 438 sub bubbles {
|
Line 439 sub bubbles {
|
} |
} |
|
|
} |
} |
$Apache::lonxml::counter++; |
&Apache::lonxml::increment_counter(); |
my %moreenv; |
|
$moreenv{'form.counter'}=$Apache::lonxml::counter; |
|
&Apache::lonnet::appenv(%moreenv); |
|
return $result; |
return $result; |
} |
} |
|
|
Line 548 sub end_foil {
|
Line 546 sub end_foil {
|
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
if ($target eq 'tex') { $text = '\item '.$text; } |
if ($target eq 'tex') { $text = '\vspace*{-2 mm}\item '.$text; } |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' |
|| $target eq 'tex' || $target eq 'analyze') { |
|| $target eq 'tex' || $target eq 'analyze') { |