chiark / gitweb /
commitid: 2d test explicit placements
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 5 Feb 2016 18:01:59 +0000 (18:01 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 5 Feb 2016 18:01:59 +0000 (18:01 +0000)
commitid.scad.pl

index 3e813b2d3cdbb4f549e09e207ba31c615524bb59..489d5c22c4ab868e0dffea2969a74fe7df3ab21b 100755 (executable)
@@ -131,11 +131,10 @@ 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;
+sub gentextmodule_demo_start_batch ($;$) {
+    ($gtm_demo_i, $gtm_demo_j) = @_;
+    $gtm_demo_j //= 0;
 }
-gentextmodule_demo_next_batch();
 
 sub gentextmodule ($@) {
     my ($form, @lines) = @_;
@@ -327,14 +326,18 @@ sub do_git () {
     }
 
     foreach my $sz (3..10) {
-       gentextmodule_demo_next_batch();
+       gentextmodule_demo_start_batch($sz-3, 0);
 
        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, ''))
@@ -366,6 +369,7 @@ while (@ARGV) {
 
 $do_git //= defined($argcounter) ? '' : 'co';
 
+gentextmodule_demo_start_batch(-1);
 gentextmodule('FontDemo', @demo);
 
 do_git();