X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=6a6475965e3e21f9d0be0502a02e19d738b67f41;hb=HEAD;hp=329d673bfb92d237093749a95718c601f77f2451;hpb=89c94db7a59904e2cb7066e075049465be8ac1ac;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 329d673bfb..6a6475965e 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -7,115 +7,57 @@ STEPMAKE_TEMPLATES = metafont \ 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 -# 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) - 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 -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) -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) -$(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)/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%.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) - -$(outdir)/emmentaler-brace.otf \ -$(outdir)/emmentaler-brace.svg: $(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)/%.otf-table: $(outdir)/%.lisp - cat $< $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \ - $(if $(findstring brace,$<),,$(subst feta,feta-noteheads,$<)) \ - $(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-noteheads23.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-table: $(foreach x, a b c d e f g h i,$(outdir)/feta-braces-$(x).lisp) + cat $^ > $@ $(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \ $(outdir)/emmentaler-brace.fontname \ @@ -123,32 +65,19 @@ $(outdir)/emmentaler-brace.otf: $(outdir)/emmentaler-brace.subfonts \ $(outdir)/emmentaler-brace.otf-gtable \ $(outdir)/emmentaler-brace.pe -$(outdir)/emmentaler-brace.otf \ -$(outdir)/emmentaler-brace.svg: $(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) - +$(outdir)/emmentaler-%.genpe: $(buildscript-dir)/gen-emmentaler-scripts + $< --dir=$(outdir) --design-size=$(patsubst emmentaler-%.genpe,%,$(notdir $@)) -# 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) \ +ALL_GEN_FILES = $(ENC_FILES) \ $(OTF_FILES) \ - $(SVG_FILES) + $(SVG_FILES) \ + $(WOFF_FILES) \ + $(LILYPOND_FONTS_CONF) # PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" @@ -159,37 +88,75 @@ INSTALLATION_OUT_SUFFIXES = 1 2 3 INSTALLATION_OUT_DIR1 = $(local_lilypond_datadir)/fonts/otf INSTALLATION_OUT_FILES1 = $(OTF_FILES) \ - $(NCSB_OTFS) + $(TEXGYRE_OTFS) \ + $(URWOTF_OTFS) INSTALLATION_OUT_DIR2 = $(local_lilypond_datadir)/fonts/svg -INSTALLATION_OUT_FILES2 = $(SVG_FILES) +INSTALLATION_OUT_FILES2 = $(SVG_FILES) $(WOFF_FILES) + +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 + +# 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)/$('$(shell cd $(outdir); pwd)'' > $@ - -$(NCSB_OTFS): $(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 - -# eof