X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=866bfbbad9f0f992f82ffbbbf21a1f040b616b9b;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=7978f67ff8689cdb4599cb4122f5ca8b00cf6e10;hpb=596d993468a675729a81dc854310dd8d1a3bbaa8;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 7978f67ff8..866bfbbad9 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -5,10 +5,9 @@ LOCALSTEPMAKE_TEMPLATES=lilypond 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 @@ -30,9 +29,9 @@ 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) @@ -44,7 +43,7 @@ TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)\ ENCODING_FILE=$(findstring $( $@ @@ -61,25 +60,32 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable) # -## No \ escaping for newlines! -define EMMENTALER_RULE -$(outdir)/emmentaler-$(1).otf $(outdir)/emmentaler-$(1).svg: $(outdir)/emmentaler-$(1).pe $(outdir)/feta$(1).pfa $(outdir)/feta-alphabet$(1).pfa $(outdir)/parmesan$(1).pfa - cd $(outdir) && $(FONTFORGE) -script emmentaler-$(1).pe -endef +$(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) -$(foreach size, $(STAFF_SIZES), $(eval $(call EMMENTALER_RULE,$(size)))) - -$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa) +$(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 - -rm -f $(outdir)/*.scale.{pfa,afm} $(outdir)/%.pfa: $(outdir)/%.log -$(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,$<)) > $@ + +## 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) @@ -92,26 +98,17 @@ $(outdir)/aybabtu.subfonts: $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py $(PYTHON) $< --dir=$(outdir) -$(outdir)/fonts.cache-1: $(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) # 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= $(TFM_FILES) $(TEXTABLES) $(TFM_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_FILES=$(MF_FILES) INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 @@ -119,7 +116,7 @@ INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) 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) @@ -130,15 +127,11 @@ INSTALLATION_OUT_FILES4=$(SVG_FILES) INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1 INSTALLATION_OUT_FILES5=$(PFA_FILES) -INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/ps/ -INSTALLATION_OUT_FILES6=$(ENC_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 .PHONY: tree-regen @@ -146,58 +139,11 @@ 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)/%.dep: $(outdir)/%.log $(outdir)/%.tfm $(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(