Revise mf/GNUmakefile.

Install SVG fonts (again).
Formatting.

1 files changed, 111 insertions, 57 deletions

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index db520c24e5..0ff9f50e47 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -1,7 +1,11 @@
+# mf/GNUmakefile
+
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont install install-out
-LOCALSTEPMAKE_TEMPLATES=lilypond
+STEPMAKE_TEMPLATES = metafont \
+		     install \
+		     install-out
+LOCALSTEPMAKE_TEMPLATES = lilypond
 
 include $(depth)/make/stepmake.make
 
@@ -9,27 +13,32 @@ include $(depth)/make/stepmake.make
 EXTRA_DIST_FILES += README mf2pt1.mp
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
-FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf)\
-	$(call src-wildcard,feta-braces-[a-z].mf)\
-	$(call src-wildcard,feta-alphabet*[0-9].mf)\
-	$(call src-wildcard,parmesan[0-9]*.mf)
+FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf) \
+		$(call src-wildcard,feta-braces-[a-z].mf) \
+		$(call src-wildcard,feta-alphabet*[0-9].mf) \
+		$(call src-wildcard,parmesan[0-9]*.mf)
 
 STAFF_SIZES = 11 13 14 16 18 20 23 26
 BRACES = a b c d e f g h i
 
-OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf)\
- $(outdir)/aybabtu.otf
-PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)\
- $(STAFF_SIZES:%=$(outdir)/emmentaler-%.dep)
-OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\
- $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
+OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \
+	    $(outdir)/aybabtu.otf
+PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe) \
+	     $(STAFF_SIZES:%=$(outdir)/emmentaler-%.dep)
+OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
+	     $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
 FETA_FONTS = $(FETA_MF_FILES:.mf=)
 SVG_FILES = $(OTF_FILES:%.otf=%.svg)
 
-FC_FIND=$(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g')
+FC_FIND = $(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' \
+		  | grep 'file:' \
+		  | sed 's/.*"\([^"]*\)".*/\1/g')
 
-NCSB_OTFS=$(addprefix $(outdir)/,CenturySchL-Ital.otf CenturySchL-BoldItal.otf CenturySchL-Roma.otf CenturySchL-Bold.otf)
-NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf
+NCSB_OTFS = $(addprefix $(outdir)/,CenturySchL-Ital.otf \
+				   CenturySchL-BoldItal.otf \
+				   CenturySchL-Roma.otf \
+				   CenturySchL-Bold.otf)
+NCSB_INSTALL_DIR = $(local_lilypond_datadir)/fonts/otf
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
@@ -50,36 +59,62 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 # 2. are not included with teTeX
 #
 
-
-$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfb  $(outdir)/feta-alphabet%.pfb  $(outdir)/parmesan%.pfb $(outdir)/feta%.otf-table $(outdir)/feta%.otf-gtable
+$(outdir)/emmentaler-%.otf \
+$(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe \
+			    $(outdir)/feta%.pfb \
+			    $(outdir)/feta-alphabet%.pfb \
+			    $(outdir)/parmesan%.pfb \
+			    $(outdir)/feta%.otf-table \
+			    $(outdir)/feta%.otf-gtable
 	cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe)
 
-$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
+$(outdir)/aybabtu.otf \
+$(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe \
+		       $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) \
+		       $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
 	cd $(outdir) && $(FONTFORGE) -script aybabtu.pe
 
 $(outdir)/%.pfb: $(outdir)/%.log
 
 $(outdir)/%.otf-table: $(outdir)/%.lisp
-	cat $< \
-		$(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
-		$(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
-
-
-## ugh -- we want this to prevent failing -j2 compiles. 
-$(outdir)/feta26.otf-table: $(outdir)/feta26.lisp $(outdir)/parmesan26.lisp $(outdir)/feta-alphabet26.lisp 
-$(outdir)/feta23.otf-table: $(outdir)/feta23.lisp $(outdir)/parmesan23.lisp $(outdir)/feta-alphabet23.lisp 
-$(outdir)/feta20.otf-table: $(outdir)/feta20.lisp $(outdir)/parmesan20.lisp $(outdir)/feta-alphabet20.lisp 
-$(outdir)/feta18.otf-table: $(outdir)/feta18.lisp $(outdir)/parmesan18.lisp $(outdir)/feta-alphabet18.lisp 
-$(outdir)/feta16.otf-table: $(outdir)/feta16.lisp $(outdir)/parmesan16.lisp $(outdir)/feta-alphabet16.lisp 
-$(outdir)/feta14.otf-table: $(outdir)/feta14.lisp $(outdir)/parmesan14.lisp $(outdir)/feta-alphabet14.lisp 
-$(outdir)/feta13.otf-table: $(outdir)/feta13.lisp $(outdir)/parmesan13.lisp $(outdir)/feta-alphabet13.lisp 
-$(outdir)/feta11.otf-table: $(outdir)/feta11.lisp $(outdir)/parmesan11.lisp $(outdir)/feta-alphabet11.lisp 
-
-
-
-$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe
-
-$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
+	cat $< $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
+	       $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
+
+
+## ugh -- we want this to prevent failing -j2 compiles.
+# $(outdir)/feta26.otf-table: $(outdir)/feta26.lisp \
+#			      $(outdir)/parmesan26.lisp \
+#			      $(outdir)/feta-alphabet26.lisp
+# $(outdir)/feta23.otf-table: $(outdir)/feta23.lisp \
+#			      $(outdir)/parmesan23.lisp \
+#			      $(outdir)/feta-alphabet23.lisp
+# $(outdir)/feta20.otf-table: $(outdir)/feta20.lisp \
+#			      $(outdir)/parmesan20.lisp \
+#			      $(outdir)/feta-alphabet20.lisp
+# $(outdir)/feta18.otf-table: $(outdir)/feta18.lisp \
+#			      $(outdir)/parmesan18.lisp \
+#			      $(outdir)/feta-alphabet18.lisp
+# $(outdir)/feta16.otf-table: $(outdir)/feta16.lisp \
+#			      $(outdir)/parmesan16.lisp \
+#			      $(outdir)/feta-alphabet16.lisp
+# $(outdir)/feta14.otf-table: $(outdir)/feta14.lisp \
+#			      $(outdir)/parmesan14.lisp \
+#			      $(outdir)/feta-alphabet14.lisp
+# $(outdir)/feta13.otf-table: $(outdir)/feta13.lisp \
+#			      $(outdir)/parmesan13.lisp \
+#			      $(outdir)/feta-alphabet13.lisp
+# $(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \
+#			      $(outdir)/parmesan11.lisp \
+#			      $(outdir)/feta-alphabet11.lisp
+
+$(outdir)/aybabtu.otf: $(outdir)/aybabtu.subfonts \
+		       $(outdir)/aybabtu.fontname \
+		       $(outdir)/aybabtu.otf-table \
+		       $(outdir)/aybabtu.otf-gtable \
+		       $(outdir)/aybabtu.pe
+
+$(outdir)/aybabtu.otf \
+$(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfb)
 
 $(outdir)/aybabtu.fontname:
 	echo -n 'aybabtu' > $@
@@ -94,26 +129,39 @@ PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
 
 # Make tfm files first, log files last,
 # so that normally log files aren't made twice
-ALL_GEN_FILES=$(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFB_FILES) $(OTF_FILES) $(SVG_FILES) 
+ALL_GEN_FILES = $(LOG_FILES) \
+		$(ENC_FILES) \
+		$(LISP_FILES) \
+		$(OTF_TABLES) \
+		$(NCSB_OTFS) \
+		$(PFB_FILES) \
+		$(OTF_FILES) \
+		$(SVG_FILES)
 
-#PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
+# PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
-INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
-INSTALLATION_FILES=$(MF_FILES)
+INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source
+INSTALLATION_FILES = $(MF_FILES)
 
-INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6
+INSTALLATION_OUT_SUFFIXES = 1 2 3
 
-INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf
-INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_OTFS)
+INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf
+INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
+			  $(NCSB_OTFS)
 
-INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
-INSTALLATION_OUT_FILES5=$(PFB_FILES)
+INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
+INSTALLATION_OUT_FILES2 = $(SVG_FILES)
 
-export MFINPUTS:=.:$(MFINPUTS)
+INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts/type1
+INSTALLATION_OUT_FILES3 = $(PFB_FILES)
 
+export MFINPUTS := .:$(MFINPUTS)
 
 
-default: $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen $(outdir)/fonts.conf
+default: $(ALL_GEN_FILES) \
+	 $(outdir)/emmentaler-20.otf \
+	 tree-regen \
+	 $(outdir)/fonts.conf
 
 .PHONY: tree-regen
 
@@ -123,24 +171,30 @@ tree-regen:
 
 ##
 ## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc $(outdir)/%.dep: $(outdir)/%.log
-	$(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) --lisp=$(outdir)/$(<F:.log=.lisp) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --enc $(outdir)/$(<F:.log=.enc)  $<
+$(outdir)/%.lisp \
+$(outdir)/%.otf-gtable \
+$(outdir)/%.enc \
+$(outdir)/%.dep: $(outdir)/%.log
+	$(PYTHON) $(buildscript-dir)/mf-to-table.py \
+		  --global-lisp=$(outdir)/$(<F:.log=.otf-gtable) \
+		  --lisp=$(outdir)/$(<F:.log=.lisp) \
+		  --outdir=$(outdir) \
+		  --dep $(outdir)/$(<F:.log=.dep) \
+		  --enc $(outdir)/$(<F:.log=.enc) \
+		  $<
 
 local-clean:
 	rm -f mfplain.mem mfplain.log
 	rm -f *.tfm *.log
 
 
-## fixme: why is this necessary?
-$(outdir)/%.enc.in: %.enc
-	cp $< $@
-
-
 $(outdir)/fonts.conf:
 	echo '<fontconfig><dir>'$(shell cd $(outdir); pwd)'</dir></fontconfig>' > $@
 
-$(NCSB_OTFS): $(NCSB_SOURCE_FILES)  $(buildscript-dir)/pfx2ttf.fontforge
+$(NCSB_OTFS): $(NCSB_SOURCE_FILES) \
+	      $(buildscript-dir)/pfx2ttf.fontforge
 	$(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
 		$(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
 			$(i).pfb $(i).afm $(outdir)/ && ) true
 
+# eof