# Full6 abcdef Full8 abcdef01
# 23456* _123456*
#
-# Full6T
-# Full9T
-# Full12T
-# Full15T
+# Full6T Full9T Full12T ... Full30T
# as Full but commit is split over two lines
# for a 3-line message; eg
# Full9T abc
our $do_git_untracked = 1;
our $argcounter;
-sub rjustt ($$) { # right justify and truncate (ie, pad and truncate at left)
- my ($sz, $whole) = @_;
+sub rjustt ($$;$) { # right justify and truncate (ie, pad and truncate at left)
+ # always includes prefix
+ my ($sz, $whole, $prefix) = @_;
+ $prefix //= '';
my $lw = length $whole;
- return $lw > $sz
- ? substr($whole, $lw-$sz)
- : sprintf "%${sz}s", $whole;
+ my $spare = $sz - $lw - (length $prefix);
+ return
+ ($spare > 0 ? (' ' x $spare) : '').
+ $prefix.
+ substr($whole, ($spare < 0 ? -$spare : 0));
}
-sub ljustt ($$$) { # always includes $suffix
+sub ljustt ($$;$) {
my ($sz, $whole, $suffix) = @_;
+ $suffix //= '';
$sz -= length $suffix;
return sprintf "%-${sz}.${sz}s%s", $whole, $suffix;
}
foreach my $sz (3..10) {
gentextmodule_demo_start_batch($sz-3);
- gentextmodule_plusq("Small$sz", rjustt($sz, $git_count.$git_dirty))
+ gentextmodule_plusq("Small$sz", rjustt($sz, $git_count, $git_dirty))
if defined $git_count;
gentextmodule_plusq("Git$sz", ljustt($sz, $git_object, $git_dirty))
if (defined $git_count && defined $git_object) {
gentextmodule("Full$sz",
- ljustt($sz, $git_object, ''),
- rjustt($sz, $git_count.$git_dirty));
-
- if (!($sz % 2)) {
- my $e = $sz/2;
- gentextmodule("Full".($e*3)."T",
- ljustt($e*2, $git_object, $git_dirty)
- =~ m/.{$e}/g,
- rjustt($e, $git_count));
- }
+ ljustt($sz, $git_object),
+ rjustt($sz, $git_count, $git_dirty));
+
+ my $e = $sz;
+ gentextmodule("Full".($e*3)."T",
+ ljustt($e*2, $git_object, $git_dirty)
+ =~ m/.{$e}/g,
+ rjustt($e, $git_count));
}
}
}