X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=commitid.scad.pl;h=3e813b2d3cdbb4f549e09e207ba31c615524bb59;hp=c03b044133d763a3111083cdd1d0cbc653d0f326;hb=1f1a48c7ecc8938a779353150fa6a68b5da0c8ee;hpb=54f5ee552c23a919792b365d96cc03ab89a11872

diff --git a/commitid.scad.pl b/commitid.scad.pl
index c03b044..3e813b2 100755
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -68,18 +68,18 @@ $SIG{__WARN__} = sub { die @_; };
 #       If tree is dirty, + or * is suffixed, reducing number of
 #       digits by 1.
 #
-#   Small4Q:
-#   Small6Q:
-#   Small8Q:
-#   Small10Q:
-#       same but in two lines eg
-#            Small4Q  10
+#   Small4S:
+#   Small6S:
+#   Small8S:
+#   Small10S:
+#       same but split into two lines eg
+#            Small4S  10
 #                     70
 #
-#   Git4   Git4Q
-#   Git6   Git6Q
-#   Git8   Git8Q
-#   Git10  Git10Q
+#   Git4   Git4S
+#   Git6   Git6S
+#   Git8   Git8S
+#   Git10  Git10S
 #       git-rev-parse HEAD   (prefix of requested length)
 #       eg
 #            Git6    82f2a2
@@ -127,6 +127,16 @@ sub chrmodname ($) {
     return "Commitid__chr_$chrx";
 }
 
+our $gtm_demo_i = -1;
+our $gtm_demo_j;
+our @gtm_demo_o;
+
+sub gentextmodule_demo_next_batch(){
+    $gtm_demo_i++;
+    $gtm_demo_j = 0;
+}
+gentextmodule_demo_next_batch();
+
 sub gentextmodule ($@) {
     my ($form, @lines) = @_;
     my $modb = "Commitid_$form";
@@ -152,8 +162,14 @@ sub gentextmodule ($@) {
     p " d=Commitid_depth();\n";
     p " translate([0,0,-d]) linear_extrude(height=d*2) ${modb}_2D();\n";
     p "}\n";
+
     p sprintf "function %s_sz() = Commitid__scale() * 0.1 * [ %d, %d ];\n",
 	$modb, 2 * ($cols * 4 - 1), 2 * (@lines * 6 - 1);
+
+    push @gtm_demo_o,
+	" translate([$gtm_demo_i * st[0], $gtm_demo_j * st[1]])".
+	" ${modb}_2D();\n";
+    $gtm_demo_j++;
 }
 
 our @demo;
@@ -253,7 +269,7 @@ sub gentextmodule_plusq ($$) {
     my $l = length $s;
     gentextmodule($form, $s);
     if (!($l & 1) && $l>=4) {
-	gentextmodule("${form}Q", substr($s,0,$l/2), substr($s,$l/2));
+	gentextmodule("${form}S", substr($s,0,$l/2), substr($s,$l/2));
     }
 }
 
@@ -311,6 +327,8 @@ sub do_git () {
     }
 
     foreach my $sz (3..10) {
+	gentextmodule_demo_next_batch();
+
 	gentextmodule_plusq("Small$sz", rjustt($sz, $git_count.$git_dirty))
 	    if defined $git_count;
 
@@ -352,6 +370,11 @@ gentextmodule('FontDemo', @demo);
 
 do_git();
 
+p "module Commitid_2DDemo(){\n";
+p " st = Commitid__scale() * [ 10, 5 ];\n";
+p $_ foreach @gtm_demo_o;
+p "}\n";
+
 flush STDOUT or die $!;
 close STDOUT or die $!;