X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/7353470c733658bd4645085180191f2bfd918ab5..104b05b5b5ca2225eb02221fd497ab8eca4bd5ae:/barcat

diff --git a/barcat b/barcat
index 804b3b0..8e23b07 100755
--- a/barcat
+++ b/barcat
@@ -50,7 +50,7 @@ GetOptions(\%opt,
 		$opt{'graph-format'} = substr $_[1], 0, 1;
 	},
 	'spark:s' => sub {
-		$opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█'];
+		$opt{spark} = [split //, $_[1] || ' ▁▂▃▄▅▆▇█'];
 	},
 	'palette=s' => sub {
 		$opt{palette} = {
@@ -236,18 +236,23 @@ while ($nr <= $#lines) {
 	$nr >= $opt{hidemax} and last if defined $opt{hidemax};
 	my $val = $values[$nr];
 	my $rel = length $val && ($val - $minval) / ($maxval - $minval);
+	my $color = !length $val || !$opt{palette} ? undef :
+		$val == $order[0] ? $opt{palette}->[-1] : # max
+		$val == $order[-1] ? $opt{palette}->[0] : # min
+		$opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ];
 
 	if ($opt{spark}) {
-		print color($opt{palette}->[ $rel * $#{$opt{palette}} ]) if $opt{palette};
-		print $opt{spark}->[ $rel * $#{$opt{spark}} ];
+		print color($color), $opt{spark}->[
+			!$val ? 0 : # blank
+			$val == $order[0] ? -1 : # max
+			$val == $order[-1] ? 1 : # min
+			$#{$opt{spark}} < 3 ? 1 :
+			$rel * ($#{$opt{spark}} - 3) + 2.5
+		];
 		next;
 	}
 
 	if (length $val) {
-		my $color = !$opt{palette} ? undef :
-			$val == $order[0] ? $opt{palette}->[-1] : # max
-			$val == $order[-1] ? $opt{palette}->[0] : # min
-			$opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ];
 		$val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
 		color($color) for $val;
 	}