X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=ae1bce56016109946a7a9f7f4a73f946497542ea;hb=932933b488622911d513602970f0cfc6d5cdb93c;hp=d0736af0c00858f49295a59b780a875cdda10e18;hpb=dde1f08da74aaf5bc63ac8b61448e96104798c14;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index d0736af0c0..ae1bce5601 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -1,36 +1,64 @@ depth = .. STEPMAKE_TEMPLATES=metafont install install-out +LOCALSTEPMAKE_TEMPLATES=lilypond include $(depth)/make/stepmake.make -AF_FILES = $(wildcard *.af) +AF_FILES = $(call src-wildcard,*.af) -EXTRA_DIST_FILES += README feta.tex merge.pe +# hangs on feta23 +MFTRACE_FLAGS= # --simplify +EXTRA_DIST_FILES += README feta.tex # We don't use $(MF_FILES), because there's more .mf cruft here -FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\ - $(wildcard feta-braces-[a-z].mf)\ - $(wildcard feta-din*[0-9].mf)\ - $(wildcard feta-nummer*[0-9].mf)\ - $(wildcard parmesan[0-9]*.mf) - +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 +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)\ + $(BRACES:%=$(outdir)/feta-braces-%.otf-table) FETA_FONTS = $(FETA_MF_FILES:.mf=) +SVG_FILES = $(OTF_FILES:%.otf=%.svg) $(ALL_FONTS:%=$(outdir)/%.svg) + -XPM_FONTS = feta20 feta-din10 feta-nummer10 feta-braces20 parmesan20 +NCSB_SOURCE_FILES=c059013l c059016l c059033l c059036l +NCSB_TTFS=$(addprefix $(outdir)/,CenturySchL-Ital.ttf CenturySchL-BoldItal.ttf CenturySchL-Roma.ttf CenturySchL-Bold.ttf) +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) -AFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.afm) \ - $(AF_FILES:%.af=$(outdir)/%.afm) -ENC_FILES = $(TEXTABLES:.tex=.enc) $(outdir)/cmr.enc -TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm) $(addprefix $(outdir)/,$(addsuffix .tfm,$(SAUTER_FONTS))) +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) -ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc)) -MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) +ENCODING_FILE=$(findstring $( $@ + +$(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable) + echo '(design_size . 20)' > $@ + # only for fonts which # @@ -39,81 +67,140 @@ MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) # 2. are not included with teTeX # -foe: - echo $(MFINPUTS) - echo $(TEXMF) - kpsewhich exbase.mf - -$(outdir)/feta20.otf: merge.pe - (cd $(outdir) ; fontforge -s merge.pe ) - - -## use separate package sauter-fonts-mftraced. -SAUTER_FONTS = - -#cmbxti8 ecbm14 ecrm12 -MORE_SAUTER_FONTS = cmbx14 cmbx17 \ - cmbxti12 cmbxti14 \ - cmbxti6 cmbxti7 cmbxti8 \ - cmcsc12 cmcsc7 cmcsc8 \ - cmss5 cmss6 cmss7 \ - cmti5 cmti6 \ - cmtt17 cmtt5 cmtt6 cmtt7 +$(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)/%.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,$<)) + 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) + +$(outdir)/aybabtu.fontname: + 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) $(SAUTER_FONTS) -PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) -PFB_FILES = $(PFA_FILES:%.pfa=%.pfb) +PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) $(PFA_OTF_FILES) # 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) $(ENC_FILES) $(FETA_LIST_FILES) $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale $(outdir)/Fontmap.lily +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 #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 4 5 6 7 +INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) -INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/afm -INSTALLATION_OUT_FILES2=$(AFM_FILES) +INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/otf +INSTALLATION_OUT_FILES2=$(OTF_FILES) $(NCSB_TTFS) INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm INSTALLATION_OUT_FILES3=$(TFM_FILES) -INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/ly -INSTALLATION_OUT_FILES4=$(FETA_LIST_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) $(outdir)/fonts.scale $(outdir)/Fontmap $(outdir)/Fontmap.lily +INSTALLATION_OUT_FILES5=$(PFA_FILES) -INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/dvips/ -INSTALLATION_OUT_FILES6=$(outdir)/lilypond.map +INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/ps/ +INSTALLATION_OUT_FILES6=$(ENC_FILES) -INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/ -INSTALLATION_OUT_FILES7=$(ENC_FILES) export MFINPUTS:=.:$(MFINPUTS) -default: pfa_warning $(ALL_GEN_FILES) +default: pfa_warning $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen + +.PHONY: tree-regen + +# FIXME: temporary hack: must regenerate after building fonts +tree-regen: + ${MAKE} -C $(top-build-dir) link-mf-tree + pfa_warning: -ifneq ($(notdir $(MFTRACE)),mftrace) +ifneq ($(shell $(MFTRACE) --version | sed 's/ .*//'),mftrace) @echo "" @echo "ERROR: mftrace not found" @echo "" - @echo "For obtaining PFA fonts, either install mftrace " + @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-pfa " - @echo " make get-rpm-pfa " - @echo " make get-deb-pfa " + @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 the internet." + @echo "These commands will try to download the files from internet." @false endif @@ -123,94 +210,44 @@ 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-pfa: $(outdir)/$(debian-package) +get-deb-fonts: $(outdir)/$(debian-package) rm -rf $(outdir)/./usr ar p $< data.tar.gz | \ - tar -C $(outdir) -zvxf - '*.pfa' - cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/ + 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-3/$(redhat-package) + wget --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package) -get-rpm-pfa: $(outdir)/$(redhat-package) +get-rpm-fonts: $(outdir)/$(redhat-package) cd $(outdir) ; rm -rf usr/ # (root alert!) - cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' - cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/ + cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' '*.svg' + cp `find $(outdir)/usr/ -name '*.pfa' -o -name '*.svg'` $(outdir)/ # change this dependency -get-pfa: get-rpm-pfa +get-fonts: get-rpm-fonts +get-pfa: get-rpm-fonts ## ## todo: this also depends on .tfm, FIXME. -$(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm - $(PYTHON) $(buildscript-dir)/mf-to-table.py --lisp=$(outdir)/$( $@ - -# using shell for loop seems most robust -$(outdir)/lilypond.map: $(AFM_FILES) - for i in $(FETA_FONTS); do echo $$i $$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') '<'$$i.pfa; done > $@ - for i in $(SAUTER_FONTS); do echo "$$i $$i <$$i.pfa"; done >> $@ - -$(outdir)/Fontmap: - echo '%!' > $@ - echo '% Override default GS Fontmap' >> $@ - echo '% To let gs load fonts from builddir, do:' >> $@ - echo '% export GS_LIB=$$(pwd)/mf/out:' >> $@ - echo '% See Fontmap.GS for the syntax of real Fontmap files.' >> $@ - echo '(Fontmap.GS) .runlibfile' >> $@ - echo '(Fontmap.lily) .runlibfile' >> $@ - -$(outdir)/Fontmap.lily: $(AFM_FILES) $(outdir)/Fontmap - echo '%!' > $@ - for i in $(FETA_FONTS); do echo "/$$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') ($$i.pfa);"; done >> $@ - for i in $(SAUTER_FONTS); do echo "$$i ($$i.pfa);"; done >> $@ - - -$(outdir)/fonts.scale: $(PFA_FILES) -# cd $(outdir) && echo $(FETA_MF_FILES:.mf=.pfa) $(FETA_MF_FILES:.mf=.pfb) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $(@F) - cd $(outdir) && echo *.pfa *.pfb | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $(@F) - -$(outdir)/fonts.dir: $(outdir)/fonts.scale - cd $(outdir) && mkfontdir - -# Sketch map file -$(outdir)/lilypond.sfd: -# cd $(outdir) && echo sketch $(FETA_MF_FILES:.mf=.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $(@F) - cd $(outdir) && echo sketch *.pfa | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $(@F) - -# Sodipodi map file -SODIPODI_FONTS = parmesan20 feta-braces0 feta-nummer10 feta20 -$(outdir)/private-fonts: - cd $(outdir) && echo sodipodi $(SODIPODI_FONTS:%=%.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $(@F) local-clean: rm -f mfplain.mem mfplain.log rm -f *.tfm *.log -afm: $(AFM_FILES) -pfa: afm $(PFA_FILES) fontdir -pfb: afm $(PFB_FILES) fontdir - - -# stupid trick to have separate rules for each PFA font ; -# otherwise building PFAs is all-or-nothing. -$(SAUTER_FONTS:%=$(outdir)/%.bla): - $(foreach i, $@, touch $i && ) true - -$(outdir)/%.pfa: $(outdir)/%.bla - $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@)) && mv $(notdir $@) $(outdir)/ - $(outdir)/%.enc.in: %.enc cp $< $@ + + +$(NCSB_TTFS): $(addsuffix .pfb,$(addprefix $(NCSB_DIR)/,$(NCSB_SOURCE_FILES))) + $(foreach i,$(NCSB_SOURCE_FILES), \ + $(FONTFORGE) -script $(buildscript-dir)/pfx2ttf.fontforge \ + $(NCSB_DIR)/$(i).pfb $(NCSB_DIR)/$(i).afm $(outdir)/ && ) true