loncom/homework/caparesponse/caparesponse.pm - diff

Return to caparesponse.pm CVS log

Up to [LON-CAPA] / loncom / homework / caparesponse

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.105 and 1.111

version 1.105, 2003/06/24 20:41:56	version 1.111, 2003/09/22 18:38:59
Line 194 sub end_numericalresponse {	Line 194 sub end_numericalresponse {
}	}
my $formatted;	my $formatted;
if ((defined($format)) && ($format ne '')) {	if ((defined($format)) && ($format ne '')) {
	$format=~s/e/E/g;
&Apache::lonxml::debug("formatting with :$format: answer :$answer:");	&Apache::lonxml::debug("formatting with :$format: answer :$answer:");
$formatted=sprintf('%.'.$format,$answer).',';	$formatted=sprintf('%.'.$format,$answer).',';
} else {	} else {
Line 247 sub end_numericalresponse {	Line 248 sub end_numericalresponse {
</textarea></font> <br /><br />';	</textarea></font> <br /><br />';
}	}
} elsif ($target eq 'tex') {	} elsif ($target eq 'tex') {
if (defined $unit and $Apache::lonhomework::type eq 'exam') {	if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
$result.=' \textit{(in} \verb\|'.$unit.'\|\textit{)} ';	$result.=' \textit{(in} \verb\|'.$unit.'\|\textit{)} ';
}	}
if ($$tagstack[-1] eq 'numericalresponse') {	if ($$tagstack[-1] eq 'numericalresponse') {
Line 324 sub end_numericalresponse {	Line 325 sub end_numericalresponse {
if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }	if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {	if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
if ($ENV{'form.answer_output_mode'} eq 'tex') {	if ($ENV{'form.answer_output_mode'} eq 'tex') {
$ans.= " Sig \\textit{$siglow - $sighigh}";	$ans.= " Sig $siglow - $sighigh";
} else {	} else {
$ans.= " Sig <i>$siglow - $sighigh</i>";	$ans.= " Sig <i>$siglow - $sighigh</i>";
}	}
Line 343 sub end_numericalresponse {	Line 344 sub end_numericalresponse {
if ($target eq 'answer') {	if ($target eq 'answer') {
if ($ENV{'form.answer_output_mode'} eq 'tex') {	if ($ENV{'form.answer_output_mode'} eq 'tex') {
$result.=&Apache::response::answer_part($$tagstack[-1],	$result.=&Apache::response::answer_part($$tagstack[-1],
"Unit: \\verb\|$unit\|");	" Unit: $unit ");
} else {	} else {
$result.=&Apache::response::answer_part($$tagstack[-1],	$result.=&Apache::response::answer_part($$tagstack[-1],
"Unit: <b>$unit</b>");	"Unit: <b>$unit</b>");
Line 366 sub end_numericalresponse {	Line 367 sub end_numericalresponse {
if ($target eq 'answer') {	if ($target eq 'answer') {
if ($ENV{'form.answer_output_mode'} eq 'tex') {	if ($ENV{'form.answer_output_mode'} eq 'tex') {
$result.=&Apache::response::answer_part($$tagstack[-1],	$result.=&Apache::response::answer_part($$tagstack[-1],
"\\textbf{$string}");	"$string");
} else {	} else {
$result.=&Apache::response::answer_part($$tagstack[-1],	$result.=&Apache::response::answer_part($$tagstack[-1],
"<b>$string</b>");	"<b>$string</b>");
Line 416 sub format_number {	Line 417 sub format_number {
my ($number,$format,$target)=@_;	my ($number,$format,$target)=@_;
my $ans;	my $ans;
if ($format ne '') {	if ($format ne '') {
	$format=~s/e/E/g;
$ans = sprintf('%.'.$format,$number);	$ans = sprintf('%.'.$format,$number);
} else {	} else {
my $format = '';	my $format = '';
#What is the number? (integer,decimal,floating point)	#What is the number? (integer,decimal,floating point)
if ($number=~/^(\d\.?\d)(E\|e)(\d*)$/) {	if ($number=~/^(\d\.?\d)(E\|e)(\d*)$/) {
$format = 'e'.$2;	if (abs($3)>=100) {$format = 'e3';} else {$format = 'e2';}
} elsif ($number=~/^(\d)\.(\d)$/) {	} elsif ($number=~/^(\d)\.(\d)$/) {
$format = '4f';	$format = '4f';
} elsif ($number=~/^(\d*)$/) {	} elsif ($number=~/^(\d*)$/) {

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

Removed from v.1.105
changed lines
	Added in v.1.111