disable markers without graph

[barcat.git] / graph

diff --git a/graph b/graph
index 7118dc198a373b799c99065a147d75c8f5604e91..0d9db2e51c4aa110a11dabedb1219db7c3107f9b 100755 (executable)
--- a/graph
+++ b/graph
@@ -19,24 +19,27 @@ GetOptions(\my %opt,
 ) or exit 64;  # EX_USAGE
 $opt{width} ||= $ENV{COLUMNS} || 80;
 $opt{color} //= 1;
-$opt{trim} //= 0;
 
 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;
-length > $opt{trim} + 1 and substr($_, $opt{trim}) = '…' for @lines;
+if (defined $opt{trim}) {
+       my $trimpos = abs $opt{trim};
+       $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    = $opt{trim} ? $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
@@ -82,11 +85,15 @@ Each line starting with a number is given a bar to visualise relative sizes.
 
 Disable colored output of values and bar markers.
 
-=item -l, --length=<size>
+=item -l, --length=[-]<size>
 
 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.
 
 =item -m, --markers=