Feed OTF fonts to GhostScript via Fontmap rather than PFA on command-line.

This should make it practical to provide metadata in comments for (e.g.)
PDF generation.

diff --git a/Fontmap b/Fontmap
new file mode 100644 (file)
index 0000000..30ce364
--- /dev/null
+++ b/Fontmap
@@ -0,0 +1,6 @@
+/Bedstead (bedstead.otf) ;
+/Bedstead-Extended (bedstead-extended.otf) ;
+/Bedstead-SemiCondensed (bedstead-semicondensed.otf) ;
+/Bedstead-Condensed (bedstead-condensed.otf) ;
+/Bedstead-ExtraCondensed (bedstead-extracondensed.otf) ;
+/Bedstead-UltraCondensed (bedstead-ultracondensed.otf) ;

diff --git a/Makefile b/Makefile
index ac74861dd1862ff0f123e63d805410908e0fbe5c..c9befab8ac21a1420db1bd75d23c6b05d6517007 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,18 +43,17 @@ bedstead-ultracondensed.sfd: bedstead
 %.pfa %.afm: %.sfd
        fontforge -lang=ff -c 'Open($$1); Generate($$2)' $< $@
 
-%.png: %.ps $(PFAFILES)
-       gs -q -dSAFER -sDEVICE=pnggray -dTextAlphaBits=4 -o $@ \
-               $(PFAFILES) $<
+%.png: %.ps $(OTFFILES)
+       gs -P -q -dSAFER -sDEVICE=pnggray -dTextAlphaBits=4 -o $@ $<
 
-bedstead-%-df.png: df.ps bedstead.pfa
-       gs -q -dSAFER -dsize=$* -sDEVICE=png16m -o $@ bedstead.pfa $<
+bedstead-%-df.png: df.ps bedstead.otf
+       gs -P -q -dSAFER -dsize=$* -sDEVICE=png16m -o $@ $<
 
 complement.ps: bedstead
        ./bedstead --complement > complement.ps
 
-complement.pdf: complement.ps bedstead.pfa
-       gs -q -dSAFER -sDEVICE=pdfwrite -o $@ bedstead.pfa $<
+complement.pdf: complement.ps bedstead.otf
+       gs -P -q -dSAFER -sDEVICE=pdfwrite -o $@ $<
 
 .PHONY: clean
 clean: