version 1.80, 2004/05/17 22:20:21
|
version 1.81, 2004/05/18 23:12:15
|
Line 480 sub floor {return (($_[0]-CORE::int($_[
|
Line 480 sub floor {return (($_[0]-CORE::int($_[
|
|
|
sub format { |
sub format { |
my ($value,$fmt)=@_; |
my ($value,$fmt)=@_; |
my $dollarmode,$commamode; |
my ($dollarmode,$commamode,$alwaysperiod,$options); |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
if ($fmt =~ /^([^\d]*)(.*)/) { $options=$1; $fmt=$2; } |
if ($fmt =~ /^,(.*)/) { $fmt=$1; $commamode=1; } |
#if ($options =~ /\$/) { $dollamode=1; } |
|
#if ($options =~ /,/) { $commamode=1; } |
|
if ($options =~ /\./) { |
|
$alwaysperiod=1; |
|
&LONCAPA_INTERNAL_DEBUG("hrrm setting it to 1"); |
|
} |
|
&LONCAPA_INTERNAL_DEBUG("alwyas per $alwaysperiod opt $options fmt $fmt"); |
$fmt=~s/e/E/g; |
$fmt=~s/e/E/g; |
my $result=sprintf('%.'.$fmt,$value); |
my $result=sprintf('%.'.$fmt,$value); |
if ($fmt eq '0f') { $result .='.'; } |
if ($alwaysperiod && $fmt eq '0f') { $result .='.'; } |
$result=~s/(E[+-]*)0/$1/; |
$result=~s/(E[+-]*)0/$1/; |
if ($dollarmode) {$result=&dollarformat($result);} |
#if ($dollarmode) {$result=&dollarformat($result);} |
if ($commamode) {$result=&commaformat($result);} |
#if ($commamode) {$result=&commaformat($result);} |
return $result; |
return $result; |
} |
} |
|
|
Line 534 sub chemparse {
|
Line 540 sub chemparse {
|
sub prettyprint { |
sub prettyprint { |
my ($value,$fmt,$target)=@_; |
my ($value,$fmt,$target)=@_; |
my $result; |
my $result; |
my $dollarmode,$commamode; |
|
if (!$target) { $target = $external::target; } |
if (!$target) { $target = $external::target; } |
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |
if ($fmt =~ /^\$(.*)/) { $fmt=$1; $dollarmode=1; } |
my ($dollarmode,$commamode,$alwaysperiod,$options); |
if ($fmt =~ /^,(.*)/) { $fmt=$1; $commamode=1; } |
if ($fmt =~ /^([^\d]*)(.*)/) { $options=$1; $fmt=$2; } |
|
if ($options =~ /\$/) { $dollamode=1; } |
|
if ($options =~ /,/) { $commamode=1; } |
|
if ($options =~ /\./) { $alwaysperiod=1; } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
if ($fmt) { $value=sprintf('%.'.$fmt,$value); } |
if ($fmt eq '0f') { $value .='.'; } |
if ($alwaysperiod && $fmt eq '0f') { |
|
if ($target eq 'tex') { |
|
$value .='\\ensuremath{.}'; |
|
} else { |
|
$value .='.'; |
|
} |
|
} |
if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) { |
if ($value =~ /([0-9\.\-\+]+)E([0-9\-\+]+)/i ) { |
my $frac=$1; |
my $frac=$1; |
if ($dollarmode) { $frac=&dollarformat($frac); } |
if ($dollarmode) { $frac=&dollarformat($frac); } |