X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/11e6fa3713f7ea24f2329def3c60b32847539799..e688749a26967b9d93c801b68c999cd262f90f7d:/barcat

diff --git a/barcat b/barcat
index 442559c..bac7ebd 100755
--- a/barcat
+++ b/barcat
@@ -6,13 +6,9 @@ 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 {
-	require Pod::Usage;
-	Pod::Usage::pod2usage(-exitval => 0, -perldocopt => '-oman', @_);
-}
 my %opt;
 GetOptions(\%opt,
 	'color|c!',
@@ -53,8 +49,28 @@ GetOptions(\%opt,
 	'stat|s!',
 	'unmodified|u!',
 	'width|w=i',
-	'usage|h' => sub { podexit() },
-	'help'    => sub { podexit(-verbose => 2) },
+	'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 {
+		require Pod::Usage;
+		Pod::Usage::pod2usage(
+			-exitval => 0, -perldocopt => '-oman', -verbose => 2,
+		);
+	},
 ) or exit 64;  # EX_USAGE
 
 $opt{width} ||= $ENV{COLUMNS} || 80;
@@ -63,6 +79,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 +110,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 +333,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>