version 1.40, 2004/04/08 14:22:48
|
version 1.43, 2004/07/08 17:45:28
|
Line 110 sub start_itemgroup {
|
Line 110 sub start_itemgroup {
|
} elsif ($target eq 'web' or $target eq 'tex') { |
} 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); |
|
$Apache::matchresponse::TeXitemgroupwidth=&Apache::lonxml::get_param('TeXitemgroupwidth',$parstack,$safeeval,undef,0); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 232 sub start_foilgroup {
|
Line 233 sub start_foilgroup {
|
my $result; |
my $result; |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::matchresponse::conceptgroup=0; |
$Apache::matchresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::pushrandomnumber(); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result.=&Apache::edit::start_table($token) |
$result.=&Apache::edit::start_table($token) |
."<tr><td>Collection Of Foils</td><td>Delete:" |
."<tr><td>Collection Of Foils</td><td>Delete:" |
Line 266 sub end_foilgroup {
|
Line 267 sub end_foilgroup {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
|
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
Line 463 sub displayfoils {
|
Line 465 sub displayfoils {
|
$question.='<br />'.$text."\n"; |
$question.='<br />'.$text."\n"; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp,$last_letter); |
my @blank; |
|
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
} |
} |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 489 sub displayfoils {
|
Line 492 sub displayfoils {
|
'</td></tr></table>'; |
'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
$tabsize=~/(\d+\.?\d*)/; |
my ($lefttabsize,$righttabsize)=(0,0); |
$tabsize=$1/2.1; |
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
$tabsize.=' mm '; |
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
$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}'; |
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
$lefttabsize.=' mm '; |
|
$righttabsize.=' mm '; |
|
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}'; |
} |
} |
} elsif ($result=&itemdisplay('left')) { |
} elsif ($result=&itemdisplay('left')) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
Line 500 sub displayfoils {
|
Line 512 sub displayfoils {
|
'</td></tr></table>'; |
'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
$tabsize=~/(\d+\.?\d*)/; |
my ($lefttabsize,$righttabsize)=(0,0); |
$tabsize=$1/2.1; |
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
$tabsize.=' mm '; |
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
$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}'; |
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$tabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
$lefttabsize.=' mm '; |
|
$righttabsize.=' mm '; |
|
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}'; |
} |
} |
} |
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |