X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/571ed1a9a73129dff78c4d04333949605b91c273..58630a8d85739e139af830d0cef81beb0510fc60:/barcat

diff --git a/barcat b/barcat
index ce3f788..dfe6a10 100755
--- a/barcat
+++ b/barcat
@@ -8,8 +8,10 @@ use re '/msx';
 
 our $VERSION = '1.07';
 
-use Getopt::Long '2.33', qw( :config gnu_getopt );
 my %opt;
+if (@ARGV) {
+require Getopt::Long;
+Getopt::Long->import('2.33', qw( :config gnu_getopt ));
 GetOptions(\%opt,
 	'ascii|a!',
 	'color|c!',
@@ -92,6 +94,7 @@ GetOptions(\%opt,
 		);
 	},
 ) or exit 64;  # EX_USAGE
+}
 
 $opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80 unless $opt{spark};
 $opt{color} //= -t *STDOUT;  # enable on tty
@@ -112,12 +115,21 @@ $opt{input} = (@ARGV && $ARGV[0] =~ m/\A[-0-9]/) ? \@ARGV : undef
 $opt{'sum-format'} = sub { sprintf '%.8g', $_[0] };
 $opt{'calc-format'} = sub { sprintf '%*.*f', 0, 2, $_[0] };
 $opt{'value-format'} = $opt{units} && sub {
-	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]
+	my $unit = (
+		log(abs $_[0] || 1) / log(10)
+		- 3 * (abs($_[0]) < .9995)   # shift to smaller unit if below 1
+		+ 1e-15  # float imprecision
+	);
+	my $decimal = ($unit % 3) == ($unit < 0);
+	$unit -= log($decimal ? .995 : .9995) / log(10);  # rounded
+	$decimal = ($unit % 3) == ($unit < 0);
+	$decimal &&= $_[0] !~ /^-?0*[0-9]{1,3}$/;  # integer 0..999
+	sprintf('%*.*f%1s',
+		3 + ($_[0] < 0), # digits plus optional negative sign
+		$decimal,  # tenths
+		$_[0] / 1000 ** int($unit/3),  # number
+		$#{$opt{units}} * 1.5 < abs $unit ? sprintf('e%d', $unit) :
+			$opt{units}->[$unit/3]  # suffix
 	);
 };
 
@@ -286,6 +298,10 @@ while ($nr <= $limit) {
 		color($color) for $val;
 	}
 	my $line = $lines[$nr] =~ s/\n/$val/r;
+	if (not length $val) {
+		say $line;
+		next;
+	}
 	printf '%-*s', $len + length($val), $line;
 	print $barmark[$_] // $opt{'graph-format'}
 		for 1 .. $size && (($values[$nr] || 0) - $minval) * $size + .5;
@@ -635,16 +651,16 @@ Or the top 3 most frequent authors with statistics over all:
 
     git shortlog -sn | barcat -L3 -s
 
-Sparkline graphics of simple input given as inline parameters:
-
-	barcat --spark= 3 1 4 1 5 0 9 2 4
-
 Activity graph of the last days (substitute date C<-v-{}d> on BSD):
 
     ( git log --pretty=%ci --since=30day | cut -b-10
       seq 0 30 | xargs -i date +%F -d-{}day ) |
     sort | uniq -c | awk '$1--' | barcat --spark
 
+Sparkline graphics of simple input given as inline parameters:
+
+	barcat --spark= 3 1 4 1 5 0 9 2 4
+
 =head1 AUTHOR
 
 Mischa POSLAWSKY <perl@shiar.org>