From 9d4f903995d825401f8c1c491b41bb2bdbe6c49e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 27 Oct 2021 00:43:58 +0100
Subject: [PATCH] prep for ppm

---
 Makefile            |  7 +++++++
 pumpkin-books.ps.pl | 12 +++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2ffbfb1..bb14123 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,13 @@ pot.pgm: 146_Kaldrono.svg Makefile
 	| pnminvert 					\
 	| $(make_pnm)
 
+droplet.pgm: droplet.svg Makefile
+	$(use_rsvg)
+	$(shell_pipe)					\
+	pngtopnm <$@.tmp.png -mix -background 'white'	\
+	| pnmdepth 255
+	| $(make_pnm)
+
 pubssh=c
 pubpath=games-rules/quacks
 puburl=https://www.chiark.greenend.org.uk/~ijackson/
diff --git a/pumpkin-books.ps.pl b/pumpkin-books.ps.pl
index d1d8330..dbeace4 100755
--- a/pumpkin-books.ps.pl
+++ b/pumpkin-books.ps.pl
@@ -707,10 +707,12 @@ $page_pre
 
 END
 
-sub def_image ($) {
-  my ($name) = @_;
+sub def_image ($$) {
+  my ($ncomps, $name) = @_;
 
-  open B, "$name.pgm" or die $!;
+  my $ext = $ncomps == 1 ? 'pgm' : $ncomps == 3 ? 'ppm' : die;
+
+  open B, "$name.$ext" or die $!;
   <B> eq "P2\n" or die;
   local $/ = undef;
   my @d = split ' ', <B>;
@@ -738,8 +740,8 @@ END
 END
 }
 
-def_image("bag");
-def_image("pot");
+def_image(1, "bag");
+def_image(1, "pot");
 
 print "gsave\n" or die $!;
 
-- 
2.30.2