--- loncom/homework/matchresponse.pm 2003/03/18 21:26:33 1.6 +++ loncom/homework/matchresponse.pm 2004/05/27 04:32:19 1.41 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Full matching style response # -# $Id: matchresponse.pm,v 1.6 2003/03/18 21:26:33 sakharuk Exp $ +# $Id: matchresponse.pm,v 1.41 2004/05/27 04:32:19 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,15 +25,13 @@ # # http://www.lon-capa.org/ # -# 2/21 Guy package Apache::matchresponse; use strict; use HTML::Entities(); use Math::Random(); -use Apache::optionresponse; - -my @Items; +use Apache::optionresponse(); +use Apache::lonlocal; BEGIN { &Apache::lonxml::register('Apache::matchresponse',('matchresponse')); @@ -49,6 +47,7 @@ sub start_matchresponse { push (@Apache::lonxml::namespace,'matchresponse'); my $id = &Apache::response::start_response($parstack,$safeeval); %Apache::hint::match=(); + undef(%Apache::response::foilnames); if ($target eq 'meta') { $result=&Apache::response::meta_package_write('matchresponse'); } elsif ($target eq 'edit' ) { @@ -68,6 +67,9 @@ sub start_matchresponse { $safeeval,'max', 'randomize'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } + } elsif ($target eq 'analyze') { + my $part_id="$Apache::inputtags::part.$id"; + push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); } return $result; } @@ -80,6 +82,7 @@ sub end_matchresponse { pop @Apache::lonxml::namespace; &Apache::lonxml::deregister('Apache::matchresponse', ('foilgroup','foil','conceptgroup')); + undef(%Apache::response::foilnames); return $result; } @@ -89,6 +92,7 @@ sub start_itemgroup { my $result; %Apache::response::itemgroup=(); %Apache::matchresponse::itemtable=(); + if ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::select_arg('Randomize Order:','randomize', @@ -103,7 +107,7 @@ sub start_itemgroup { $safeeval,'randomize', 'location'); 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::lonxml::get_param('location',$parstack,$safeeval); } @@ -114,12 +118,17 @@ sub end_itemgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; + if ($target eq 'edit') { $result=&Apache::edit::end_table(); } if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; } my @names=@{ $Apache::response::itemgroup{'names'} }; my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); if ($randomize ne 'no' ) { - @names=&whichorder($#names+1,$randomize,0, - \%Apache::response::itemgroup) + @names=&Apache::response::whichorder($#names+1,$randomize,0, + \%Apache::response::itemgroup); + } + if ($target eq 'analyze') { + my $partid="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + push (@{ $Apache::lonhomework::analyze{"$partid.items"} }, @names); } my %letter_name_map; my %name_letter_map; @@ -128,10 +137,9 @@ sub end_itemgroup { foreach my $name (@names) { $letter_name_map{$alphabet[$i]}=$name; $name_letter_map{$name}=$alphabet[$i]; - push @Items, $alphabet[$i]; $i++; } - $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; + $Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; $Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; if ($target eq 'web') { my $table=''; @@ -145,24 +153,25 @@ sub end_itemgroup { $table.='
'; $Apache::matchresponse::itemtable{'display'}=$table; } elsif ($target eq 'tex') { - my $table=' \\\\\\\\ \begin{tabular}{ll} '; + my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; my $i=0; foreach my $name (@names) { - $table.=' '.$alphabet[$i].' & '. - $Apache::response::itemgroup{$name.'.text'}. - ' \\\\ '; + $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; + $table.='\item['.$alphabet[$i].'] '. + $Apache::response::itemgroup{$name.'.text'}; $i++; } - $table.=' \end{tabular} \\\\ '; + $table.=' \end{description} \strut '; + if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} $Apache::matchresponse::itemtable{'display'}=$table; - } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } + } return $result; } sub start_item { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { my $randomize=&Apache::lonxml::get_param('randomize',$parstack, @@ -188,11 +197,11 @@ sub end_item { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { $text=&Apache::lonxml::endredirection; } if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || - $target eq 'edit' || $target eq 'tex') { + $target eq 'edit' || $target eq 'tex' || $target eq 'analyze') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); my $location=&Apache::lonxml::get_param('location',$parstack, $safeeval); @@ -223,7 +232,7 @@ sub start_foilgroup { my $result; %Apache::response::foilgroup=(); $Apache::matchresponse::conceptgroup=0; - &Apache::response::setrandomnumber(); + &Apache::response::pushrandomnumber(); if ($target eq 'edit') { $result.=&Apache::edit::start_table($token) ."Collection Of FoilsDelete:" @@ -237,7 +246,7 @@ 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' || $target eq 'tex') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); my $randomize = &Apache::lonxml::get_param('randomize',$parstack, $safeeval,'-2'); @@ -247,20 +256,36 @@ sub end_foilgroup { $result=&displayanswers($max,$randomize); } elsif ( $target eq 'grade') { &grade_response($max,$randomize); + } elsif ( $target eq 'analyze') { + my @shown=&whichfoils($max,$randomize); + &Apache::response::analyze_store_foilgroup(\@shown, + ['text','value','location']); + #FIXME need to store options in some way } + &Apache::lonxml::increment_counter(&getfoilcounts($max)); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } + &Apache::response::poprandomnumber(); return $result; } +sub whichfoils { + my ($max,$randomize)=@_; + return &Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); +} + sub displayanswers { my ($max,$randomize,@opt)=@_; if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } my @names = @{ $Apache::response::foilgroup{'names'} }; - my @whichfoils = &whichorder(&getfoilcounts($max),$randomize, - &Apache::response::showallfoils(), - \%Apache::response::foilgroup); + my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); my $result=&Apache::response::answer_header('matchresponse'); my %name_letter_map; if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { @@ -279,25 +304,28 @@ sub displayanswers { sub grade_response { my ($max,$randomize)=@_; - my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, - &Apache::response::showallfoils(), - \%Apache::response::foilgroup); + my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); if (!defined($ENV{'form.submitted'})) { return; } my %responsehash; my %grade; - my ($temp,$right,$wrong,$ignored)=(0,0,0,0); + my ($temp,$right,$wrong,$ignored)=(1,0,0,0); my %letter_name_map; if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { %letter_name_map= %{ $Apache::response::itemgroup{'letter_name_map'} }; } + my @items; foreach my $name (@whichfoils) { - my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; + my $response = &Apache::response::getresponse($temp,'letter'); + push(@items,$response); my $responsename = $letter_name_map{$response}; - $responsehash{$name}=$responsename; my $value=$Apache::response::foilgroup{$name.'.value'}; if ( $response =~ /[^\s]/) { - &Apache::lonxml::debug("submitted a $response for $value
\n"); + $responsehash{$name}=$responsename; + &Apache::lonxml::debug("submitted a $response($responsename) for $value
\n"); if ($value eq $responsename) { $grade{$name}='1'; $right++; } else { @@ -311,28 +339,45 @@ sub grade_response { my $part=$Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; my $responsestr=&Apache::lonnet::hash2str(%responsehash); + my $itemstr =&Apache::lonnet::array2str(@items); my $gradestr =&Apache::lonnet::hash2str(%grade); - my %previous =&Apache::response::check_for_previous($responsestr, - $part,$id); + my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); &Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); - my $ad; - if ($wrong==0 && $ignored==0) { - $ad='EXACT_ANS'; - } elsif ($wrong==0 && $right==0) { - #nothing submitted - } else { - if ($ignored==0) { - $ad='INCORRECT'; - } else { - $ad='MISSING_ANSWER'; - } - } $Apache::lonhomework::results{"resource.$part.$id.submission"}= $responsestr; + $Apache::lonhomework::results{"resource.$part.$id.submissionitems"}= + $itemstr; $Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= $gradestr; - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; - &Apache::response::handle_previous(\%previous,$ad); + if (!$Apache::lonhomework::scantronmode) { + my $ad; + if ($wrong==0 && $ignored==0) { + $ad='EXACT_ANS'; + } elsif ($wrong==0 && $right==0) { + #nothing submitted + } else { + if ($ignored==0) { + $ad='INCORRECT'; + } else { + $ad='MISSING_ANSWER'; + } + } + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + &Apache::response::handle_previous(\%previous,$ad); + } else { + my $ad; + if ($wrong==0 && $right==0) { + #nothing submitted + } else { + $ad='ASSIGNED_SCORE'; + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= + $ad; + $Apache::lonhomework::results{"resource.$part.$id.awarded"}= + $right/(scalar(@whichfoils)); + $Apache::lonhomework::results{"resource.$part.$id.numfoils"}= + scalar(@whichfoils); + } + } } sub itemdisplay { @@ -350,12 +395,12 @@ sub displayfoils { my ($target,$max,$randomize)=@_; my $result; my $question; - my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, - &Apache::response::showallfoils(), - \%Apache::response::foilgroup); + my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), + $randomize, + &Apache::response::showallfoils(), + \%Apache::response::foilgroup); my $part=$Apache::inputtags::part; my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; - my $status=$Apache::inputtags::status[-1]; my %letter_name_map; if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { %letter_name_map= @@ -366,7 +411,7 @@ sub displayfoils { %name_letter_map= %{ $Apache::response::itemgroup{'name_letter_map'} }; } - if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { + if ( &Apache::response::show_answer() && ($target ne 'tex')) { foreach my $name (@whichfoils) { my $text=$Apache::response::foilgroup{$name.'.text'}; my $value=$Apache::response::foilgroup{$name.'.value'}; @@ -379,45 +424,57 @@ sub displayfoils { } } else { my $i = 0; - my $temp=0; + my $temp=1; 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 @alphabet=('A'..'Z'); + my @used_letters=sort(keys(%letter_name_map)); + my $internal_counter=$Apache::lonxml::counter; foreach my $name (@whichfoils) { my $lastopt=$lastresponse{$name}; my $last_letter=$name_letter_map{$lastopt}; my $optionlist = ''; - if ($target ne 'tex') {$optionlist="\n";} - else {$optionlist='\framebox[5 mm][s]{\tiny\strut}';} + if ($target ne 'tex') { + $optionlist="\n"; + } else { + if ($Apache::lonhomework::type ne 'exam') { + $optionlist='\framebox[5 mm][s]{\tiny\strut}'; + } + } my $option; - foreach $option (sort(keys(%letter_name_map))) { + foreach $option (@used_letters) { if ($option eq $last_letter) { if ($target ne 'tex') {$optionlist.="\n";} } else { if ($target ne 'tex') {$optionlist.="\n";} } } - if ($target ne 'tex') { + if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { $optionlist='\n"; - } else { - $optionlist=$optionlist; } my $text=$Apache::response::foilgroup{$name.'.text'}; if ($target ne 'tex') { - $question.='
'.$optionlist.$text."\n"; + if ($Apache::lonhomework::type ne 'exam') { + $question.='
'.$optionlist.$text."\n"; + } else { + $question.='
'.$text."\n"; + } if ($Apache::lonhomework::type eq 'exam') { - $question.=&Apache::optionresponse::webbubbles(\@Items,\@Items); + $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter); } } else { if ($Apache::lonhomework::type eq 'exam') { $question.=' '.$optionlist.$text."\n"; - $question.='\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.&Apache::optionresponse::bubbles(\@Items,\@Items).'\end{enumerate}\strut '; - &Apache::lonxml::increment_counter(); + my @emptyItems = (); + for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} + $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut '; + $internal_counter++; } else { - $question.=' \\\\ '.$optionlist.$text."\n"; + $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; } } $temp++; @@ -428,11 +485,27 @@ sub displayfoils { } elsif ($result=&itemdisplay('bottom')) { $result=$question.$result; } elsif ($result=&itemdisplay('right')) { - $result='
'.$question.''.$result. - '
'; + if ($target ne 'tex') { + $result='
'.$question.''.$result. + '
'; + } else { + my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); + $tabsize=~/(\d+\.?\d*)/; + $tabsize=$1/2.1; + $tabsize.=' mm '; + $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}\end{tabular}'; + } } elsif ($result=&itemdisplay('left')) { - $result='
'.$result.''.$question. - '
'; + if ($target ne 'tex') { + $result='
'.$result.''.$question. + '
'; + } else { + my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); + $tabsize=~/(\d+\.?\d*)/; + $tabsize=$1/2.1; + $tabsize.=' mm '; + $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}\end{tabular}'; + } } if ($target ne 'tex') {$result.="
";} else {$result.=' \\\\ ';} return $result; @@ -448,52 +521,6 @@ sub getfoilcounts { return $count; } -sub whichorder { - my ($max,$randomize,$showall,$hash)=@_; - #&Apache::lonxml::debug("man $max randomize $randomize"); - if (!defined(@{ $$hash{'names'} })) { return; } - my @names = @{ $$hash{'names'} }; - my @whichopt =(); - my (%top,@toplist,%bottom,@bottomlist); - if (!($showall || ($randomize eq 'no'))) { - my $current=0; - foreach my $name (@names) { - $current++; - if ($$hash{"$name.location"} eq 'top') { - $top{$name}=$current; - } elsif ($$hash{"$name.location"} eq 'bottom') { - $bottom{$name}=$current; - } - } - } - while ((($#whichopt+1) < $max) && ($#names > -1)) { - #&Apache::lonxml::debug("Have $#whichopt max is $max"); - my $aopt; - if ($showall || ($randomize eq 'no')) { - $aopt=0; - } else { - $aopt=int(&Math::Random::random_uniform() * ($#names+1)); - } - #&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); - $aopt=splice(@names,$aopt,1); - #&Apache::lonxml::debug("Picked $aopt"); - if ($top{$aopt}) { - $toplist[$top{$aopt}]=$aopt; - } elsif ($bottom{$aopt}) { - $bottomlist[$bottom{$aopt}]=$aopt; - } else { - push (@whichopt,$aopt); - } - } - for (my $i=0;$i<=$#toplist;$i++) { - if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) } - } - for (my $i=0;$i<=$#bottomlist;$i++) { - if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) } - } - - return @whichopt; -} sub start_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; @@ -518,31 +545,12 @@ sub end_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::matchresponse::conceptgroup=0; my $result=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) { - #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'} }; - my $pick=int(&Math::Random::random_uniform() * ($#names+1)); - my $name=$names[$pick]; - push @{ $Apache::response::foilgroup{'names'} }, $name; - $Apache::response::foilgroup{"$name.value"} = - $Apache::response::conceptgroup{"$name.value"}; - $Apache::response::foilgroup{"$name.text"} = - $Apache::response::conceptgroup{"$name.text"}; - $Apache::response::foilgroup{"$name.location"} = - $Apache::response::conceptgroup{"$name.location"}; - my $concept = &Apache::lonxml::get_param('concept',$parstack, - $safeeval); - $Apache::response::foilgroup{"$name.concept"} = $concept; - &Apache::lonxml::debug("Selecting $name in $concept"); - if ($target eq 'web') { - my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; - push(@{ $Apache::hint::match{"$part_id.concepts"} }, - $concept); - $Apache::hint::match{"$part_id.concept.$concept"}= - $Apache::response::conceptgroup{'names'}; - } - } + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::response::pick_foil_for_concept($target, + ['value','text','location'], + \%Apache::hint::match, + $parstack,$safeeval); } elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } @@ -557,7 +565,7 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,"Foil"); @@ -589,27 +597,49 @@ sub end_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { $text=&Apache::lonxml::endredirection; } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); - my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval); &Apache::lonxml::debug("Got a name of :$name:"); if (!$name) { $name=$Apache::lonxml::curdepth; } &Apache::lonxml::debug("Using a name of :$name:"); + if (defined($Apache::response::foilnames{$name})) { + &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",$name)); + } + $Apache::response::foilnames{$name}++; + my $location =&Apache::lonxml::get_param('location',$parstack, + $safeeval); if ( $Apache::matchresponse::conceptgroup && !&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::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 ($Apache::lonhomework::type eq 'exam') { + if ($target eq 'tex') { + $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; + } else { + $Apache::response::foilgroup{"$name.text"} = $text; + } + } else { + if ($target eq 'tex') { + $Apache::response::foilgroup{"$name.text"} = $text; + } else { + $Apache::response::foilgroup{"$name.text"} = $text; + } + } $Apache::response::foilgroup{"$name.location"} = $location; } }