X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/ba560363d26272c0464706f5352be7a929729ff2..047d20c16603fb80b5abfe2fe1d1bb073e117eab:/barcat

diff --git a/barcat b/barcat
index db9de17..a664d0d 100755
--- a/barcat
+++ b/barcat
@@ -143,10 +143,11 @@ if ($opt{markers} // 1 and $size > 0) {
 @lines > $nr or return if $opt{hidemin};
 
 sub sival {
-	my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
-	my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x;
+	my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1) + 1e-15);
+	my $float = sprintf '%e', $_[0] / 1000 ** $unit;  #TODO: or $_[0] =~ /\./
+	$float -= int($float);
 	sprintf('%*.*f%*s',
-		$float ? 5 : 3, $float,  # length and tenths
+		$float ? (5,1) : (3,0),  # length and tenths
 		$_[0] / 1000 ** $unit,   # number
 		$float ? 0 : 3,          # unit size
 		$#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit]
@@ -192,6 +193,7 @@ if ($opt{stat}) {
 }
 
 __END__
+=encoding utf8
 
 =head1 NAME
 
@@ -354,7 +356,7 @@ External datasets, like movies per year:
 But please get I<jq> to process JSON
 and replace the manual selection by C<< jq '.[].year' >>.
 
-PokE<eacute>mon height comparison:
+Pokémon height comparison:
 
     curl https://github.com/Biuni/PokemonGO-Pokedex/raw/master/pokedex.json |
     jq -r '.pokemon[] | [.height,.num,.name] | join(" ")' | barcat