X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=6a6475965e3e21f9d0be0502a02e19d738b67f41;hb=HEAD;hp=b57930a3b08aac3ced558f24e1a305a2fb53f9f5;hpb=44ec216ed7a8f92311cdb8ea925d6e5cab4a72a0;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b57930a3b0..6a6475965e 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -1,154 +1,167 @@
+# mf/GNUmakefile
+
 depth = ..
 
-STEPMAKE_TEMPLATES=metafont install install-out
-LOCALSTEPMAKE_TEMPLATES=lilypond
+STEPMAKE_TEMPLATES = metafont \
+		     install \
+		     install-out
+LOCALSTEPMAKE_TEMPLATES = lilypond
+
+# These are the main .mf files.  We don't use $(MF_FILES) here,
+# because there are more .mf files, input'ed into the main files.
+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,feta-noteheads*[0-9].mf) \
+		$(call src-wildcard,feta-flags*[0-9].mf) \
+		$(call src-wildcard,parmesan[0-9]*.mf) \
+		$(call src-wildcard,parmesan-noteheads*[0-9].mf)
+FETA_FONTS = $(FETA_MF_FILES:.mf=)
+ALL_FONTS = $(FETA_FONTS)
+PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb)
 
 include $(depth)/make/stepmake.make
 
 
-MFTRACE_FLAGS=  --simplify
-
 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)
-
 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)
-FETA_FONTS = $(FETA_MF_FILES:.mf=)
-SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg)
+OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \
+	    $(outdir)/emmentaler-brace.otf
+OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table) \
+	     $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
+SVG_FILES = $(OTF_FILES:%.otf=%.svg)
+WOFF_FILES = $(OTF_FILES:%.otf=%.woff)
 
-FC_FIND=$(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g')
+TEXGYRE_OTFS = $(addprefix $(TEXGYRE_DIR)/,$(TEXGYRE_FILES))
+URWOTF_OTFS = $(addprefix $(URWOTF_DIR)/,$(URWOTF_FILES))
 
-NCSB_OTFS=$(addprefix $(outdir)/,CenturySchL-Ital.otf CenturySchL-BoldItal.otf CenturySchL-Roma.otf CenturySchL-Bold.otf)
-NCSB_INSTALL_DIR=$(local_lilypond_datadir)/fonts/otf
+LILYPOND_FONTS_CONF = $(outdir)/00-lilypond-fonts.conf \
+		      $(outdir)/99-lilypond-fonts.conf
 
 LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
 LISP_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.lisp)
 ENC_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.enc)
 TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
 
-ENCODING_FILE=$(findstring $(<F:.mf=.enc), $(FETA_MF_FILES:.mf=.enc))
-MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(outdir)/$(ENCODING_FILE),) --no-afm
-
-$(outdir)/aybabtu.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
-	cat $^ > $@
-
-$(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
+$(outdir)/emmentaler-brace.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 	echo '(design_size . 20)' > $@
 
+$(outdir)/feta%.otf-table: $(outdir)/feta%.lisp $(outdir)/parmesan%.lisp \
+	$(outdir)/parmesan-noteheads%.lisp \
+	$(outdir)/feta-noteheads%.lisp \
+	$(outdir)/feta-flags%.lisp \
+	$(outdir)/feta-alphabet%.lisp
+	cat $^ > $@
 
-# only for fonts which
-#
-# 1. are mentioned in font.scm
-#
-# 2. are not included with teTeX
-#
-
-
-$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa  $(outdir)/feta-alphabet%.pfa  $(outdir)/parmesan%.pfa $(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).pfa) $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable
-	cd $(outdir) && $(FONTFORGE) -script aybabtu.pe
-
-$(outdir)/%.pfa: $(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)/emmentaler-brace.otf-table: $(foreach x, a b c d e f g h i,$(outdir)/feta-braces-$(x).lisp)
+	cat $^ > $@
 
-$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa)
+$(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \
+				$(outdir)/emmentaler-brace.fontname \
+				$(outdir)/emmentaler-brace.otf-table \
+				$(outdir)/emmentaler-brace.otf-gtable \
+				$(outdir)/emmentaler-brace.pe
 
-$(outdir)/aybabtu.fontname:
-	echo -n 'aybabtu' > $@
-$(outdir)/aybabtu.subfonts:
+$(outdir)/emmentaler-brace.fontname:
+	printf 'emmentaler-brace' > $@
+$(outdir)/emmentaler-brace.subfonts:
 	echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
-$(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py
-	$(PYTHON) $< --dir=$(outdir)
-
-ALL_FONTS = $(FETA_FONTS)
-PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
-
-# 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) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) 
+$(outdir)/emmentaler-%.genpe: $(buildscript-dir)/gen-emmentaler-scripts
+	$< --dir=$(outdir) --design-size=$(patsubst emmentaler-%.genpe,%,$(notdir $@))
 
-#PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
+ALL_GEN_FILES = $(ENC_FILES) \
+		$(OTF_FILES) \
+		$(SVG_FILES) \
+		$(WOFF_FILES) \
+		$(LILYPOND_FONTS_CONF)
 
-INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
-INSTALLATION_FILES=$(MF_FILES)
+# PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
 
-INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6
+INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source
+INSTALLATION_FILES = $(MF_FILES)
 
-INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf
-INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_OTFS)
+INSTALLATION_OUT_SUFFIXES = 1 2 3
 
-INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg
-INSTALLATION_OUT_FILES4=$(SVG_FILES)
+INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf
+INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
+			  $(TEXGYRE_OTFS) \
+			  $(URWOTF_OTFS)
 
-INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1
-INSTALLATION_OUT_FILES5=$(PFA_FILES)
+INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
+INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES)
 
-export MFINPUTS:=.:$(MFINPUTS)
+INSTALLATION_OUT_DIR3 = $(local_lilypond_datadir)/fonts
+INSTALLATION_OUT_FILES3 = $(LILYPOND_FONTS_CONF)
 
+export MFINPUTS := .:$(MFINPUTS)
 
+# A few rules here generate multiple files from one command line.  For
+# treating this case, we only declare one output explicitly, and use a
+# dummy rules for the other outputs. The dummy rule uses
+# $(UPDATE_TARGET) so the order of writing in the real command does
+# not confuse make.
+UPDATE_TARGET = if test -f $@; then touch $@ ; fi
 
-default: $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen $(outdir)/fonts.conf
+# only for fonts which
+#
+# 1. are mentioned in font.scm
+#
+# 2. are not included with teTeX
+#
+$(outdir)/%.lisp: $(outdir)/%.log $(outdir)/%.tfm
+	$(buildscript-dir)/mf-to-table \
+		--global-lisp=$(outdir)/$(<F:.log=.otf-gtable) \
+		--lisp=$(outdir)/$(<F:.log=.lisp) \
+		--outdir=$(outdir) \
+		--enc $(outdir)/$(<F:.log=.enc) \
+		$<
+
+$(outdir)/%.otf-gtable $(outdir)/%.enc: $(outdir)/%.lisp
+	$(UPDATE_TARGET)
+
+## Putting pfb here forces all .pfb fonts to be built before
+# fontforge starts generating emmentaler-*.* fonts.
+$(outdir)/emmentaler-%.otf: $(outdir)/emmentaler-%.genpe \
+			    $(outdir)/feta%.pfb \
+			    $(outdir)/feta-noteheads%.pfb \
+			    $(outdir)/feta-flags%.pfb \
+			    $(outdir)/feta-alphabet%.pfb \
+			    $(outdir)/parmesan%.pfb \
+			    $(outdir)/parmesan-noteheads%.pfb \
+			    $(outdir)/feta%.otf-table \
+			    $(outdir)/feta%.otf-gtable \
+			    | pfb
+	cd $(outdir) && $(FONTFORGE) -script $(notdir $<)
+
+$(outdir)/emmentaler-%.svg $(outdir)/emmentaler-%.woff: $(outdir)/emmentaler-%.otf
+	$(UPDATE_TARGET)
+
+$(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.pe\
+		       $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) \
+		       $(outdir)/emmentaler-brace.otf-table $(outdir)/emmentaler-brace.otf-gtable \
+		       | pfb
+	cd $(outdir) && $(FONTFORGE) -script emmentaler-brace.pe
+
+$(outdir)/emmentaler-brace.svg $(outdir)/emmentaler-brace.woff: $(outdir)/emmentaler-brace.otf
+	$(UPDATE_TARGET)
+
+default: tree-regen \
+	 $(outdir)/fonts.conf
 
 .PHONY: tree-regen
 
-# FIXME: temporary hack: must regenerate after building fonts
-tree-regen:
+tree-regen: $(ALL_GEN_FILES)
 	${MAKE} -C $(top-build-dir) link-mf-tree
 
-##
-## 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)  $<
 
 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
-	$(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
-		$(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \
-			$(i).pfb $(i).afm $(outdir)/ && ) true
-