X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=mf%2FGNUmakefile;h=19b6e242a47a9da998114dbf18e184bdfdcb2704;hb=366316fd6be846c2050be6b1b3955b261026187e;hp=d7a150d2087e47dabe2e1c66ff37832f15a7981a;hpb=e166ef4d795f43bcdff1f04162d17c2d8c7a9302;p=lilypond.git

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index d7a150d208..0172275c6d 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -1,73 +1,184 @@
-depth = ..
-
-STEPMAKE_TEMPLATES=metafont install install-out
-LOCALSTEPMAKE_TEMPLATES=asciifont
-
-
-include $(depth)/make/stepmake.make 
-
-AF_FILES = $(wildcard *.af) 
-
-EXTRA_DIST_FILES += README feta.tex
-
-# don't try to make fonts from test files
-TEST_FILES = $(wildcard *test*.mf)
-FET_FILES = $(filter-out $(TEST_FILES),\
-  $(wildcard feta[0-9]*.mf) $(wildcard parmesan[0-9]*.mf))
-FONT_FILES = $(filter-out $(TEST_FILES),\
-$(wildcard feta*[0-9].mf) $(wildcard parmesan*[0-9].mf))
-
-XPM_FONTS = feta20 feta-nummer10 feta-braces20
-#CM_AFM_FILES = cmr10
-
-$(outdir)/cmr10.afm:
-	-$(GUILE) $(buildscript-dir)/tfm2oafm.scm `kpsewhich cmr10.tfm`
-	-mv $(@F) $@
-
-LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
-TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(AF_FILES:.af=.afm) $(addsuffix .afm, $(CM_AFM_FILES)))
-TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
-PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa))
-PFB_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfb))
+# mf/GNUmakefile
 
+depth = ..
 
-# Make tfm files first, log files last, 
-# so that normally log files aren't made twice
-ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES)
-
-#PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
-INSTALLATION_DIR=$(datadir)/mf/
-INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)
-
-INSTALLATION_OUT_SUFFIXES=1 2 3 4
-
-INSTALLATION_OUT_DIR1=$(datadir)/tex
-INSTALLATION_OUT_FILES1=$(TEXTABLES)
-
-INSTALLATION_OUT_DIR2=$(datadir)/afm
-INSTALLATION_OUT_FILES2=$(AFM_FILES)
-
-INSTALLATION_OUT_DIR3=$(datadir)/tfm
-INSTALLATION_OUT_FILES3=$(TFM_FILES)
+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
+
+
+EXTRA_DIST_FILES += README mf2pt1.mp
+
+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)/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)
+
+NCSB_OTFS = $(addprefix $(outdir)/,CenturySchL-Ital.otf \
+				   CenturySchL-BoldItal.otf \
+				   CenturySchL-Roma.otf \
+				   CenturySchL-Bold.otf)
+
+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)
+
+$(outdir)/emmentaler-brace.otf-table: $(BRACES:%=$(outdir)/feta-braces-%.otf-table)
+	cat $^ > $@
+
+$(outdir)/emmentaler-brace.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
+	echo '(design_size . 20)' > $@
+
+$(outdir)/%.otf-table: $(outdir)/%.lisp
+	cat $< $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
+	       $(if $(findstring brace,$<),,$(subst feta,parmesan-noteheads,$<)) \
+	       $(if $(findstring brace,$<),,$(subst feta,feta-noteheads,$<)) \
+	       $(if $(findstring brace,$<),,$(subst feta,feta-flags,$<)) \
+	       $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@
+
+
+$(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)/emmentaler-brace.fontname:
+	printf 'emmentaler-brace' > $@
+$(outdir)/emmentaler-brace.subfonts:
+	echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
+
+$(outdir)/emmentaler-%.genpe: $(buildscript-dir)/gen-emmentaler-scripts
+	$< --dir=$(outdir) --design-size=$(patsubst emmentaler-%.genpe,%,$(notdir $@))
+
+# Generate emmentaler-*.pe scripts first, and *.otf, *.svg, *.woff files last,
+# so that normally these files aren't regenerated on a subsequent call to make.
+ALL_GEN_FILES = $(PE_SCRIPTS) \
+		$(LOG_FILES) \
+		$(ENC_FILES) \
+		$(LISP_FILES) \
+		$(OTF_TABLES) \
+		$(NCSB_OTFS) \
+		$(OTF_FILES) \
+		$(SVG_FILES) \
+		$(WOFF_FILES)
+
+# PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
+
+INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source
+INSTALLATION_FILES = $(MF_FILES)
+
+INSTALLATION_OUT_SUFFIXES = 1 2
+
+INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf
+INSTALLATION_OUT_FILES1 = $(OTF_FILES) \
+			  $(NCSB_OTFS)
+
+INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg
+INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES)
+
+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
+
+# 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: $(ALL_GEN_FILES) \
+	 $(outdir)/emmentaler-20.otf \
+	 tree-regen \
+	 $(outdir)/fonts.conf
+
+.PHONY: tree-regen
+
+# FIXME: temporary hack: must regenerate after building fonts
+tree-regen: $(ALL_GEN_FILES)
+	${MAKE} -C $(top-build-dir) link-mf-tree
 
-# comment these out if you don't want pfa's to be generated
-# or you don't have metapost.
-INSTALLATION_OUT_DIR4=$(datadir)/pfa
-INSTALLATION_OUT_FILES4=$(PFA_FILES)
 
-export MFINPUTS:=.:$(MFINPUTS)
+local-clean:
+	rm -f mfplain.mem mfplain.log
+	rm -f *.tfm *.log
 
-default: $(ALL_GEN_FILES)
 
-##
-## todo: this also depends on .tfm, FIXME.
-$(outdir)/%.afm  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log 
-	$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep)  --afm $(outdir)/$(<F:.log=.afm) --tex $(outdir)/$(<F:.log=.tex) $<
+$(outdir)/fonts.conf:
+	echo '<fontconfig><dir>'$(shell cd $(outdir); pwd)'</dir></fontconfig>' > $@
 
-local-clean:
-	rm -f mfplain.mem mfplain.log 
-	rm -f *.tfm *.log
 
+$(outdir)/CenturySchL-Roma.otf: $(NCSB_SOURCE_FILES) \
+	      $(auxscript-dir)/pfx2ttf.fontforge
+	$(foreach i, $(basename $(NCSB_SOURCE_FILES)), \
+		$(FONTFORGE) -script $(auxscript-dir)/pfx2ttf.fontforge \
+			$(i).pfb $(i).afm $(outdir)/ && ) true
 
-pfb: $(PFB_FILES) 
+$(addprefix $(outdir)/,CenturySchL-Ital.otf \
+	CenturySchL-Bold.otf \
+	CenturySchL-BoldItal.otf): $(outdir)/CenturySchL-Roma.otf
+	$(UPDATE_TARGET)