commitid.scad.pl: Use m//g to split up for S

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

diff --git a/commitid.scad.pl b/commitid.scad.pl
index f4a0d19388369df7704d179b813372a525628252..c09ce6ab4f635c64a7a0f33b074aee0c525330c0 100755 (executable)
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -25,7 +25,7 @@ $SIG{__WARN__} = sub { die @_; };
 #            generate a form FORM containing TEXT
 #            TEXT can contain newlines (final newline usually undesirable)
 #            if FORM not specified, generates Arg0 Arg1 Arg2 in sequence
-#            character set is SPC 0-9 a-f + * (`*' glyph is `=/=').
+#            character set is SPC 0-9 a-f + *
 #
 # We generate a physical indication of which commit was used.
 #
@@ -148,9 +148,9 @@ sub gentextmodule ($@) {
        $y--;
        my $x = 0;
        foreach my $chr (split //, $line) {
-           next if $chr !~ m/\S/;
            p sprintf "  translate([%d * 0.8, %d * 1.2]) %s();\n",
-               $x, $y, chrmodname $chr;
+               $x, $y, chrmodname $chr
+               if $chr =~ m/\S/;
            $x++;
        }
        $cols = $x if $x > $cols;
@@ -274,7 +274,10 @@ sub gentextmodule_plusq ($$) {
     my $l = length $s;
     gentextmodule($form, $s);
     if (!($l & 1) && $l>=4) {
-       gentextmodule("${form}S", substr($s,0,$l/2), substr($s,$l/2));
+       my $e = $l/2;
+       gentextmodule("${form}S", $s =~ m/.{$e}/g);
+    } else {
+       $gtm_demo_j++;
     }
 }
 
@@ -332,18 +335,14 @@ sub do_git () {
     }
 
     foreach my $sz (3..10) {
-       gentextmodule_demo_start_batch($sz-3, 0);
+       gentextmodule_demo_start_batch($sz-3);
 
        gentextmodule_plusq("Small$sz", rjustt($sz, $git_count.$git_dirty))
            if defined $git_count;
 
-       gentextmodule_demo_start_batch($sz-3, 2);
-
        gentextmodule_plusq("Git$sz", ljustt($sz, $git_object, $git_dirty))
            if defined $git_object;
 
-       gentextmodule_demo_start_batch($sz-3, 4);
-
        gentextmodule("Full$sz",
                      rjustt($sz, $git_count.$git_dirty),
                      ljustt($sz, $git_object, ''))
@@ -417,8 +416,8 @@ a b c d e f
 
 + *
 
-      r
- #  ###
-###  #
- #  ###
-    L 
+    # #
+ #  \#/
+### ###
+ #  /#\
+    # #