From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Nov 2021 19:37:51 +0000 (+0000)
Subject: break out @tiles processing nfc
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1d7b0dfa6a9d66d458361393af33a5b937f53637;p=quacks.git

break out @tiles processing nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/pumpkin-books.ps.pl b/pumpkin-books.ps.pl
index cbc32dd..d911cf2 100755
--- a/pumpkin-books.ps.pl
+++ b/pumpkin-books.ps.pl
@@ -771,15 +771,25 @@ def_image(3, "droplet");
 
 print "gsave\n" or die $!;
 
-our @books = (
-	      red_book(),
-	      green_book(),
-	      purple_book(),
-	      blue_book(),
-	      lotus_book(),
-	      yellow_book(),
-	      [black_book_pair(), black_book_more()],
-	     );
-
-print tile(@books) or die $! if 1;
+our @books = qw(
+		 red_book
+		 green_book
+		 purple_book
+		 blue_book
+		 lotus_book
+		 yellow_book
+		 black_book_pair/black_book_more
+	      );
+
+our @tiles;
+
+foreach my $spec (@books) {
+  my @datas;
+  foreach my $book (split m{/}, $spec) {
+    push @datas, ${*::}{"$book"}();
+  }
+  push @tiles, @datas == 1 ? @datas : \@datas;
+}
+
+print tile(@tiles) or die $! if 1;