version 1.20, 2003/07/01 20:13:30
|
version 1.24, 2003/09/24 18:14:30
|
Line 102 sub start_itemgroup {
|
Line 102 sub start_itemgroup {
|
$safeeval,'randomize', |
$safeeval,'randomize', |
'location'); |
'location'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web' or $target eq 'tex') { |
$Apache::matchresponse::itemtable{'location'}= |
$Apache::matchresponse::itemtable{'location'}= |
&Apache::lonxml::get_param('location',$parstack,$safeeval); |
&Apache::lonxml::get_param('location',$parstack,$safeeval); |
} |
} |
Line 144 sub end_itemgroup {
|
Line 144 sub end_itemgroup {
|
$table.='</table>'; |
$table.='</table>'; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $table=' \\\\\\\\ \begin{description} '; |
my $table=' \begin{description} '; |
my $i=0; |
my $i=0; |
foreach my $name (@names) { |
foreach my $name (@names) { |
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
$table.='\item['.$alphabet[$i].'] '. |
$table.='\item['.$alphabet[$i].'] '. |
$Apache::response::itemgroup{$name.'.text'}. |
$Apache::response::itemgroup{$name.'.text'}; |
' \\\\ '; |
|
$i++; |
$i++; |
} |
} |
$table.=' \end{description} \strut \\\\ '; |
$table.=' \end{description} \strut '; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
} |
} |
return $result; |
return $result; |
Line 370 sub displayfoils {
|
Line 369 sub displayfoils {
|
%name_letter_map= |
%name_letter_map= |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
} |
} |
if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { |
if ((($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) && ($target ne 'tex')) { |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
Line 433 sub displayfoils {
|
Line 432 sub displayfoils {
|
$question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut '; |
$question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} else { |
} else { |
$question.=' \\\\ '.$optionlist.$text."\n"; |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
} |
} |
} |
} |
$temp++; |
$temp++; |
Line 488 sub end_conceptgroup {
|
Line 487 sub end_conceptgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::matchresponse::conceptgroup=0; |
$Apache::matchresponse::conceptgroup=0; |
my $result=''; |
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 not there aren't any foils to display and thus no question |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
Line 591 sub end_foil {
|
Line 590 sub end_foil {
|
} |
} |
} else { |
} else { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; |
$Apache::response::foilgroup{"$name.text"} = $text; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = $text; |
} |
} |