commitid.scad.pl: Rename Full<n> to Full<n*2>

[reprap-play.git] / commitid.scad.pl

diff --git a/commitid.scad.pl b/commitid.scad.pl
index ebdbe917a39a6cb73db24da322d83a22e85af045..6838365d9b2999404f988ba187240d9b3cf2ae50 100755 (executable)
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -58,14 +58,7 @@ $SIG{__WARN__} = sub { die @_; };
 #    (where it is added depends on the Form; in any case it does not
 #    change the size, but steals space from digits)
 #
-#   Small3:
-#   Small4:
-#   Small5:
-#   Small6:
-#   Small7:
-#   Small8:
-#   Small9:
-#   Small10:
+#   Small2 Small3 ... Small10:
 #       git rev-list --first-parent --count HEAD
 #       typically 3-4 characters but we allow for up to 6
 #       padded with zeroes; if too long we reduce mod 10^n
@@ -73,42 +66,29 @@ $SIG{__WARN__} = sub { die @_; };
 #            Small5    3456*
 #            Small8    __123456    (where _ are spaces)
 #
-#   Small4S:
-#   Small6S:   Small6T:
-#   Small8S:   Small9T:
-#   Small10S:
+#   Small2S Small4S ... Small10S:
+#   Small3T Small9T:
 #       same but split into two lines (S) or three lines (T) eg
 #            Small4S  45     Small6T   _3
 #                     6*               45
 #                                      6*
 #
-#   Git4   Git4S
-#   Git6   Git6S   Git6T
-#   Git8   Git8S
-#   Git9           Git9T
-#   Git10  Git10S
+#   Git2 Git3 ... Git10:
+#   Git4S Git6S ... Git10S:
+#   Git6T Git9T:
 #       git-rev-parse HEAD   (prefix of requested length)
 #       eg if the commitid is abcdef0123...
 #            Git5    abcd*
 
-#   Full3
-#   Full4
-#   Full5
-#   Full6
-#   Full7
-#   Full8
-#   Full9
-#   Full10
+#   Full4 Full6 ... Full20:
 #       git-rev-list --first-parent --count HEAD
 #       git-rev-parse HEAD
+#       (all on two lines)
 #       eg
 #            Full6    abcdef       Full8     abcdef01
 #                     23456*                 _123456*
 #
-#   Full6T
-#   Full9T
-#   Full12T
-#   Full15T
+#   Full6T Full9T ... Full30T
 #       as Full but commit is split over two lines
 #       for a 3-line message; eg
 #             Full9T    abc
@@ -144,9 +124,9 @@ our $gtm_demo_i = -1;
 our $gtm_demo_j;
 our @gtm_demo_o;
 
-sub gentextmodule_demo_start_batch ($;$) {
-    ($gtm_demo_i, $gtm_demo_j) = @_;
-    $gtm_demo_j //= 0;
+sub gentextmodule_demo_start_batch () {
+    $gtm_demo_j = 0;
+    $gtm_demo_i++;
 }
 
 sub gentextmodule ($@) {
@@ -268,16 +248,21 @@ our $do_git; # contains may chars 'c' (count) and/or 'o' (object)
 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;
 }
@@ -353,27 +338,25 @@ sub do_git () {
        $git_object = gitoutput qw(rev-parse HEAD);
     }
 
-    foreach my $sz (3..10) {
-       gentextmodule_demo_start_batch($sz-3);
+    foreach my $sz (2..10) {
+       gentextmodule_demo_start_batch();
 
-       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_object;
 
        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));
-           }
+           gentextmodule("Full".($sz*2),
+                         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));
        }
     }
 }    
@@ -402,7 +385,7 @@ while (@ARGV) {
 
 $do_git //= defined($argcounter) ? '' : 'co';
 
-gentextmodule_demo_start_batch(-1);
+gentextmodule_demo_start_batch();
 gentextmodule('FontDemo', @demo);
 
 do_git();