loncom/homework/matchresponse.pm - diff

Return to matchresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/matchresponse.pm between versions 1.41 and 1.44

version 1.41, 2004/05/27 04:32:19	version 1.44, 2004/07/08 17:51:31
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 464 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 490 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 501 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*)/;
	$lefttabsize=$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.=' \\\\ ';}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.41
changed lines
	Added in v.1.44