X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/f4423db9671d9650e7a39482ffc935d373e72ef5..b7992da312c627399c0363b59b3c00df380aee1d:/barcat

diff --git a/barcat b/barcat
index 82cf7d6..a443942 100755
--- a/barcat
+++ b/barcat
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl -CA
 use 5.018;
 use warnings;
 use utf8;
@@ -6,7 +6,7 @@ use List::Util qw( min max sum );
 use open qw( :std :utf8 );
 use experimental qw( lexical_subs );
 
-our $VERSION = '1.04';
+our $VERSION = '1.05';
 
 use Getopt::Long '2.33', qw( :config gnu_getopt );
 sub podexit {
@@ -47,13 +47,28 @@ GetOptions(\%opt,
 		);
 	},
 	'markers|m=s',
-	'spark!' => sub {
-		$opt{spark} = [split //, '⎽▁▂▃▄▅▆▇█'];
+	'spark:s' => sub {
+		$opt{spark} = [split //, $_[1] || '⎽▁▂▃▄▅▆▇█'];
 	},
 	'stat|s!',
 	'unmodified|u!',
 	'width|w=i',
-	'usage|h' => sub { podexit() },
+	'usage|h' => sub {
+		local $/;
+		my $pod = readline *DATA;
+		$pod =~ s/^=over\K/ 22/m;  # indent options list
+		$pod =~ s/^=item \N*\n\n\N*\n\K(?:(?:^=over.*?^=back\n)?(?!=)\N*\n)*/\n/msg;
+
+		require Pod::Usage;
+		my $parser = Pod::Usage->new;
+		$parser->select('SYNOPSIS', 'OPTIONS');
+		$parser->output_string(\my $contents);
+		$parser->parse_string_document($pod);
+
+		$contents =~ s/\n(?=\n\h)//msg;  # strip space between items
+		print $contents;
+		exit;
+	},
 	'help'    => sub { podexit(-verbose => 2) },
 ) or exit 64;  # EX_USAGE
 
@@ -63,6 +78,7 @@ $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
 $opt{units}   = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'};
 $opt{anchor} //= qr/\A/;
 $opt{'value-length'} = 6 if $opt{units};
+$opt{'value-length'} = 1 if $opt{unmodified};
 
 my (@lines, @values, @order);
 
@@ -93,6 +109,7 @@ while (readline) {
 	push @order, $1 if length $1;
 	if (defined $opt{trim} and defined $1) {
 		my $trimpos = abs $opt{trim};
+		$trimpos -= length $1 if $opt{unmodified};
 		if ($trimpos <= 1) {
 			$_ = substr $_, 0, 1;
 		}
@@ -315,7 +332,7 @@ Total statistics after all data.
 
 =item -u, --unmodified
 
-Do not strip leading whitespace.
+Do not reformat values, keeping leading whitespace.
 Keep original value alignment, which may be significant in some programs.
 
 =item --value-length=<size>