X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=f81b56dabef7f8de1bd4cd73b9bec5c7670b21bd;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=c47b2697d359dcc63e775d5af6802887a82dcbd4;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index c47b2697d3..f81b56dabe 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -7,17 +7,22 @@ STEPMAKE_TEMPLATES = metafont \ install-out LOCALSTEPMAKE_TEMPLATES = lilypond -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,feta-notehead*[0-9].mf) \ - $(call src-wildcard,parmesan[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 @@ -27,7 +32,6 @@ OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf) \ PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe) 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) WOFF_FILES = $(OTF_FILES:%.otf=%.woff) @@ -53,73 +57,29 @@ $(outdir)/emmentaler-brace.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gt echo '(design_size . 20)' > $@ -# only for fonts which -# -# 1. are mentioned in font.scm -# -# 2. are not included with teTeX -# -$(outdir)/emmentaler-%.otf\ - $(outdir)/emmentaler-%.svg\ - $(outdir)/emmentaler-%.woff: $(outdir)/emmentaler-%.pe \ - $(outdir)/feta%.pfb \ - $(outdir)/feta-noteheads%.pfb \ - $(outdir)/feta-alphabet%.pfb \ - $(outdir)/parmesan%.pfb \ - $(outdir)/feta%.otf-table \ - $(outdir)/feta%.otf-gtable - cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe) +## ugh -- we want this to prevent failing -j2 compiles. +define FETAxx-PREREQUISITES -$(outdir)/emmentaler-brace.otf\ - $(outdir)/emmentaler-brace.svg\ - $(outdir)/emmentaler-brace.woff: $(outdir)/emmentaler-brace.pe \ - $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfb) \ - $(outdir)/emmentaler-brace.otf-table $(outdir)/emmentaler-brace.otf-gtable - cd $(outdir) && $(FONTFORGE) -script emmentaler-brace.pe -$(outdir)/%.pfb: $(outdir)/%.log +$(outdir)/feta$(i).otf-table: $(outdir)/feta$(i).lisp \ + $(outdir)/feta-noteheads$(i).lisp \ + $(outdir)/feta-flags$(i).lisp \ + $(outdir)/parmesan$(i).lisp \ + $(outdir)/parmesan-noteheads$(i).lisp \ + $(outdir)/feta-alphabet$(i).lisp +endef + +$(eval $(foreach i,$(STAFF_SIZES),$(FETAxx-PREREQUISITES))) $(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,$<)) > $@ -## ugh -- we want this to prevent failing -j2 compiles. -$(outdir)/feta26.otf-table: $(outdir)/feta26.lisp \ - $(outdir)/feta-noteheads26.lisp \ - $(outdir)/parmesan26.lisp \ - $(outdir)/feta-alphabet26.lisp -$(outdir)/feta23.otf-table: $(outdir)/feta23.lisp \ - $(outdir)/feta-noteheads23.lisp \ - $(outdir)/parmesan23.lisp \ - $(outdir)/feta-alphabet23.lisp -$(outdir)/feta20.otf-table: $(outdir)/feta20.lisp \ - $(outdir)/feta-noteheads20.lisp \ - $(outdir)/parmesan20.lisp \ - $(outdir)/feta-alphabet20.lisp -$(outdir)/feta18.otf-table: $(outdir)/feta18.lisp \ - $(outdir)/feta-noteheads18.lisp \ - $(outdir)/parmesan18.lisp \ - $(outdir)/feta-alphabet18.lisp -$(outdir)/feta16.otf-table: $(outdir)/feta16.lisp \ - $(outdir)/feta-noteheads16.lisp \ - $(outdir)/parmesan16.lisp \ - $(outdir)/feta-alphabet16.lisp -$(outdir)/feta14.otf-table: $(outdir)/feta14.lisp \ - $(outdir)/feta-noteheads14.lisp \ - $(outdir)/parmesan14.lisp \ - $(outdir)/feta-alphabet14.lisp -$(outdir)/feta13.otf-table: $(outdir)/feta13.lisp \ - $(outdir)/feta-noteheads13.lisp \ - $(outdir)/parmesan13.lisp \ - $(outdir)/feta-alphabet13.lisp -$(outdir)/feta11.otf-table: $(outdir)/feta11.lisp \ - $(outdir)/feta-noteheads11.lisp \ - $(outdir)/parmesan11.lisp \ - $(outdir)/feta-alphabet11.lisp - $(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \ $(outdir)/emmentaler-brace.fontname \ $(outdir)/emmentaler-brace.otf-table \ @@ -131,18 +91,13 @@ $(outdir)/emmentaler-brace.otf\ $(outdir)/emmentaler-brace.woff: $(BRACES:%=$(outdir)/feta-braces-%.pfb) $(outdir)/emmentaler-brace.fontname: - echo -n 'emmentaler-brace' > $@ + 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 $< --dir=$(outdir) -ALL_FONTS = $(FETA_FONTS) -PFB_FILES = $(ALL_FONTS:%=$(outdir)/%.pfb) - -.PRECIOUS: $(PFB_FILES) - # Make tfm files first, log files last, # so that normally log files aren't made twice @@ -160,7 +115,7 @@ ALL_GEN_FILES = $(LOG_FILES) \ INSTALLATION_DIR = $(local_lilypond_datadir)/fonts/source INSTALLATION_FILES = $(MF_FILES) -INSTALLATION_OUT_SUFFIXES = 1 2 3 +INSTALLATION_OUT_SUFFIXES = 1 2 INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf INSTALLATION_OUT_FILES1 = $(OTF_FILES) \ @@ -171,8 +126,48 @@ INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES) export MFINPUTS := .:$(MFINPUTS) +# only for fonts which +# +# 1. are mentioned in font.scm +# +# 2. are not included with teTeX +# +$(outdir)/%.lisp \ +$(outdir)/%.otf-gtable \ +$(outdir)/%.enc \ +$(outdir)/%.pe: $(outdir)/%.log $(outdir)/%.tfm + $(buildscript-dir)/mf-to-table \ + --global-lisp=$(outdir)/$(