X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=mf%2FGNUmakefile;h=59e22f850f45558692efeb2845e23cd32be9ad4a;hb=5ae46f750bfb3a947d4adc26044560da54c21e17;hp=13ebabb5a49acd7910da8bd2ea5d01fc97f2efd9;hpb=66940807f0b1cea75c7ad014174418fa97c6f1f2;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 13ebabb5a4..59e22f850f 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -3,14 +3,12 @@ depth = .. STEPMAKE_TEMPLATES=metafont install install-out LOCALSTEPMAKE_TEMPLATES=lilypond -include $(depth)/make/stepmake.make +include $(depth)/make/stepmake.make -AF_FILES = $(call src-wildcard,*.af) -# hangs on feta23 -MFTRACE_FLAGS= # --simplify +MFTRACE_FLAGS= --simplify -EXTRA_DIST_FILES += README feta.tex +EXTRA_DIST_FILES += README # We don't use $(MF_FILES), because there's more .mf cruft here FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf)\ @@ -20,12 +18,9 @@ FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf)\ STAFF_SIZES = 11 13 14 16 18 20 23 26 BRACES = a b c d e f g h i -PFA_PREFIX = PFA OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf)\ $(outdir)/aybabtu.otf -PFA_OTF_FILES = $(STAFF_SIZES:%=$(outdir)/$(PFA_PREFIX)emmentaler-%.pfa)\ - $(outdir)/$(PFA_PREFIX)aybabtu.pfa PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)\ $(STAFF_SIZES:%=$(outdir)/emmentaler-%.dep) OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\ @@ -33,25 +28,18 @@ OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\ FETA_FONTS = $(FETA_MF_FILES:.mf=) SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg) +FC_FIND=$(shell $(FCMATCH) --verbose 'Century Schoolbook L:style=$(1)' | grep 'file:' | sed 's/.*"\([^"]*\)".*/\1/g') -NCSB_SOURCE_FILES=c059013l c059016l c059033l c059036l -NCSB_TTFS=$(addprefix $(outdir)/,CenturySchL-Ital.ttf CenturySchL-BoldItal.ttf CenturySchL-Roma.ttf CenturySchL-Bold.ttf) +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) -TEXTABLES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tex) -ENC_FILES = $(TEXTABLES:.tex=.enc) -TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)\ - $(SAUTER_FONTS:%=$(outdir)/%.tfm) -FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly) - +ENC_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.enc) +TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm) ENCODING_FILE=$(findstring $( $@ @@ -67,118 +55,73 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable) # 2. are not included with teTeX # -$(outdir)/$(PFA_PREFIX)%.pfa $(outdir)/%.otf $(outdir)/%.svg: $(outdir)/%.pe - (cd $(outdir) && $(FONTFORGE) -script $(notdir $<)) - $(PYTHON) $(buildscript-dir)/substitute-encoding.py --outdir=$(outdir) $@ - -rm -f $(outdir)/*.scale.pfa -# ugh, this does not work +$(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)/feta-alphabet%.pfa: $(outdir)/feta-alphabet%.log -$(outdir)/emmentaler-%.otf $(outdir)/$(PFA_PREFIX)emmentaler-%.pfa $(outdir)/emmentaler%.svg: $(outdir)/feta%.pfa $(outdir)/feta-alphabet%.pfa $(outdir)/parmesan%.pfa - -# AARGH? - -$(outdir)/feta11.pfa: $(outdir)/feta11.log -$(outdir)/feta13.pfa: $(outdir)/feta13.log -$(outdir)/feta14.pfa: $(outdir)/feta14.log -$(outdir)/feta16.pfa: $(outdir)/feta16.log -$(outdir)/feta18.pfa: $(outdir)/feta18.log -$(outdir)/feta20.pfa: $(outdir)/feta20.log -$(outdir)/feta23.pfa: $(outdir)/feta23.log -$(outdir)/feta26.pfa: $(outdir)/feta26.log - -$(outdir)/feta-alphabet11.pfa: $(outdir)/feta-alphabet11.log -$(outdir)/feta-alphabet13.pfa: $(outdir)/feta-alphabet13.log -$(outdir)/feta-alphabet14.pfa: $(outdir)/feta-alphabet14.log -$(outdir)/feta-alphabet16.pfa: $(outdir)/feta-alphabet16.log -$(outdir)/feta-alphabet18.pfa: $(outdir)/feta-alphabet18.log -$(outdir)/feta-alphabet20.pfa: $(outdir)/feta-alphabet20.log -$(outdir)/feta-alphabet23.pfa: $(outdir)/feta-alphabet23.log -$(outdir)/feta-alphabet26.pfa: $(outdir)/feta-alphabet26.log - -$(outdir)/parmesan11.pfa: $(outdir)/parmesan11.log -$(outdir)/parmesan13.pfa: $(outdir)/parmesan13.log -$(outdir)/parmesan14.pfa: $(outdir)/parmesan14.log -$(outdir)/parmesan16.pfa: $(outdir)/parmesan16.log -$(outdir)/parmesan18.pfa: $(outdir)/parmesan18.log -$(outdir)/parmesan20.pfa: $(outdir)/parmesan20.log -$(outdir)/parmesan23.pfa: $(outdir)/parmesan23.log -$(outdir)/parmesan26.pfa: $(outdir)/parmesan26.log - -$(outdir)/$(PFA_PREFIX)emmentaler-11.otf $(outdir)/$(PFA_PREFIX)emmentaler-11.pfa: $(outdir)/feta11.pfa $(outdir)/feta-alphabet11.pfa $(outdir)/parmesan11.pfa -$(outdir)/$(PFA_PREFIX)emmentaler-13.otf $(outdir)/$(PFA_PREFIX)emmentaler-13.pfa: $(outdir)/feta13.pfa $(outdir)/feta-alphabet13.pfa $(outdir)/parmesan13.pfa -$(outdir)/$(PFA_PREFIX)emmentaler-14.otf $(outdir)/$(PFA_PREFIX)emmentaler-14.pfa: $(outdir)/feta14.pfa $(outdir)/feta-alphabet14.pfa $(outdir)/parmesan14.pfa -$(outdir)/$(PFA_PREFIX)emmentaler-16.otf $(outdir)/$(PFA_PREFIX)emmentaler-16.pfa: $(outdir)/feta16.pfa $(outdir)/feta-alphabet16.pfa $(outdir)/parmesan16.pfa -$(outdir)/$(PFA_PREFIX)emmentaler-18.otf $(outdir)/$(PFA_PREFIX)emmentaler-18.pfa: $(outdir)/feta18.pfa $(outdir)/feta-alphabet18.pfa $(outdir)/parmesan18.pfa -$(outdir)/$(PFA_PREFIX)emmentaler-20.otf $(outdir)/$(PFA_PREFIX)emmentaler-20.pfa: $(outdir)/feta20.pfa $(outdir)/feta-alphabet20.pfa $(outdir)/parmesan20.pfa -$(outdir)/$(PFA_PREFIX)emmentaler-23.otf $(outdir)/$(PFA_PREFIX)emmentaler-23.pfa: $(outdir)/feta23.pfa $(outdir)/feta-alphabet23.pfa $(outdir)/parmesan23.pfa -$(outdir)/$(PFA_PREFIX)emmentaler-26.otf $(outdir)/$(PFA_PREFIX)emmentaler-26.pfa: $(outdir)/feta26.pfa $(outdir)/feta-alphabet26.pfa $(outdir)/parmesan26.pfa - - -$(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) + +$(outdir)/%.otf-table: $(outdir)/%.lisp cat $< \ $(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \ $(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) > $@ -$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa: $(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe -$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa $(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa) +## 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-%.pfa) $(outdir)/aybabtu.fontname: - echo -n 'aybabtu' > $@ -$(outdir)/aybabtu.subfonts: + echo -n 'aybabtu' > $@ +$(outdir)/aybabtu.subfonts: echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@ $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py $(PYTHON) $< --dir=$(outdir) -$(outdir)/fonts.cache-1: $(PFA_OTF_FILES) $(PFA_FILES) $(OTF_FILES) - cd $(outdir) ; fc-cache . - -local-install: install-fc-cache - -install-fc-cache: - $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), rm -f $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/fonts.cache-1 && ) true - fc-cache $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))) +ALL_FONTS = $(FETA_FONTS) +PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) -ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS) -PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES) - -# Make tfm files first, log files last, +# Make tfm files first, log files last, # so that normally log files aren't made twice -ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(NCSB_TTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1 +ALL_GEN_FILES=$(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" -INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source -INSTALLATION_FILES=$(MF_FILES) $(AF_FILES) -INSTALLATION_OUT_SUFFIXES=1 2 3 5 7 8 9 +INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source +INSTALLATION_FILES=$(MF_FILES) -INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex -INSTALLATION_OUT_FILES1=$(TEXTABLES) +INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf -INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_TTFS) +INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_OTFS) -INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm -INSTALLATION_OUT_FILES3=$(TFM_FILES) +INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/svg +INSTALLATION_OUT_FILES4=$(SVG_FILES) INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1 INSTALLATION_OUT_FILES5=$(PFA_FILES) -INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/ -INSTALLATION_OUT_FILES7=$(ENC_FILES) - -INSTALLATION_OUT_DIR9=$(local_lilypond_datadir)/fonts/svg -INSTALLATION_OUT_FILES9=$(SVG_FILES) - - export MFINPUTS:=.:$(MFINPUTS) -default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen +default: $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen $(outdir)/fonts.conf .PHONY: tree-regen @@ -186,76 +129,26 @@ default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen tree-regen: ${MAKE} -C $(top-build-dir) link-mf-tree -pfa_warning: -ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace) - @echo "" - @echo "ERROR: mftrace not found" - @echo "" - @echo "For obtaining PFA/SVG fonts, either install mftrace " - @echo "(see http://www.xs4all.nl/~hanwen/mftrace/ )," - @echo "or try one of the following commands in this directory: " - @echo "" - @echo " make get-fonts " - @echo " make get-rpm-fonts " - @echo " make get-deb-fonts " - @echo "" - @echo "These commands will try to download the files from internet." - @false -endif - - -debian-mirror=http://ftp.us.debian.org -debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb -$(outdir)/$(debian-package): - wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package) - -get-deb-fonts: $(outdir)/$(debian-package) - rm -rf $(outdir)/./usr - ar p $< data.tar.gz | \ - tar -C $(outdir) -zvxf - '*.pfa' '*.svg' - cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/ - - -redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm -$(outdir)/$(redhat-package): - wget --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package) - -get-rpm-fonts: $(outdir)/$(redhat-package) - cd $(outdir) ; rm -rf usr/ # (root alert!) - cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg' - cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/ - -# change this dependency -get-fonts: get-rpm-fonts -get-pfa: get-rpm-fonts - - ## ## todo: this also depends on .tfm, FIXME. -$(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm - $(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$('$(shell cd $(outdir); pwd)'' > $@ -$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_PATH)/,$(NCSB_SOURCE_FILES))) - $(foreach i,$(NCSB_SOURCE_FILES), \ +$(NCSB_OTFS): $(NCSB_SOURCE_FILES) $(buildscript-dir)/pfx2ttf.fontforge + $(foreach i, $(basename $(NCSB_SOURCE_FILES)), \ $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \ - $(NCSB_PATH)/$(i).pfb $(NCSB_PATH)/$(i).afm $(outdir)/ && ) true + $(i).pfb $(i).afm $(outdir)/ && ) true +