--- loncom/homework/default_homework.lcpm 2003/06/24 20:41:56 1.64 +++ loncom/homework/default_homework.lcpm 2003/09/25 18:48:40 1.66 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run() # -# $Id: default_homework.lcpm,v 1.64 2003/06/24 20:41:56 albertel Exp $ +# $Id: default_homework.lcpm,v 1.66 2003/09/25 18:48:40 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -490,6 +490,7 @@ sub format { my ($value,$fmt)=@_; my $dollarmode; if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } + $fmt=~/e/E/g; my $result=sprintf('%.'.$fmt,$value); $result=~s/(E[+-]*)0/$1/; if ($dollarmode) {$result=&dollarmode($result);} @@ -508,6 +509,8 @@ sub prettyprint { my $exponent=$2; $exponent=~s/^\+0*//; $exponent=~s/^-0*/-/; + $exponent=~s/^-0*/-/; + if ($exponent eq '-') { undef($exponent); } if ($exponent) { if ($external::target eq 'web') { $result=$frac.'×10'.$exponent.'';