X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/9d00e1a25f6c17bd712d2d3e94484cc3df421df8..6b073cda9ed996cec5895eb2d9f0b0fd88e50312:/graph

diff --git a/graph b/graph
index 6da39b9..0d9db2e 100755
--- a/graph
+++ b/graph
@@ -24,21 +24,22 @@ my @lines = readline or exit;
 chomp for @lines;
 my @values = map { s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x and $1 } @lines;
 my @order  = sort { $b <=> $a } grep { length } @values;
-if ($opt{trim}) {
+if (defined $opt{trim}) {
 	my $trimpos = abs $opt{trim};
-	length > 1 + $trimpos and substr($_, $trimpos) = '…' for @lines;
+	$trimpos <= 1 ? ($_ = substr($_, 0, 1)) :
+	(length > $trimpos and substr($_, $trimpos - 1) = '…') for @lines;
 }
 
 my $maxval = $order[0];
 my $minval = min $order[-1], 0;
 my $lenval = max map { length } @order;
-my $len    = defined $opt{trim} && $opt{trim} < 0 ? -$opt{trim} + 2 :
+my $len    = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
 	1 + max map { length } @lines;  # left padding
 my $size   = ($maxval - $minval) &&
 	($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
 my @barmark;
-if ($opt{markers} // 1) {
+if ($opt{markers} // 1 and $size > 0) {
 	sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size }
 	$barmark[ (sum(@order) / @order - $minval) * $size ] = '=';  # average
 	$barmark[ orderpos($#order / 2) ] = '+';  # mean
@@ -88,7 +89,8 @@ Disable colored output of values and bar markers.
 
 Trim line contents (between number and bars)
 to a maximum number of characters.
-The exceeding part is replaced by an abbreviation sign.
+The exceeding part is replaced by an abbreviation sign,
+unless C<--length=0>.
 
 Prepend a dash (i.e. make negative) to enforce padding
 regardless of encountered contents.