shorten human-readable values to 2-3 digits

[barcat.git] / barcat

diff --git a/barcat b/barcat
index db9de174eee475b66ced06814c50dd21562d6552..22f8d31193486139c6b5d8e5531594dff2115488 100755 (executable)
--- a/barcat
+++ b/barcat
@@ -143,13 +143,12 @@ 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;
-       sprintf('%*.*f%*s',
-               $float ? 5 : 3, $float,  # length and tenths
-               $_[0] / 1000 ** $unit,   # number
-               $float ? 0 : 3,          # unit size
-               $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit]
+       my $unit = int(log(abs $_[0] || 1) / log(10) - 3*($_[0] < 1) + 1e-15);
+       my $float = $_[0] !~ /^0*[-0-9]{1,3}$/;
+       sprintf('%3.*f%1s',
+               $float && ($unit % 3) == ($unit < 0),  # tenths
+               $_[0] / 1000 ** int($unit/3),   # number
+               $#{$opt{units}} * 1.5 < abs $unit ? "e$unit" : $opt{units}->[$unit/3]
        );
 }
 
@@ -192,6 +191,7 @@ if ($opt{stat}) {
 }
 
 __END__
+=encoding utf8
 
 =head1 NAME
 
@@ -354,7 +354,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