prep for ppm

diff --git a/Makefile b/Makefile
index 2ffbfb1e8f4da5b73e01b3863394d279aecca3d8..bb1412345c7e5f471041fac19fe6031d03c0efbf 100644 (file)
--- 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 d1d8330ed4a416a203781fd0ece0c6bb6115f795..dbeace468420ee30a97aaff5b33c5130af805136 100755 (executable)
--- 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 $!;