X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=1cb01b5c9b6df91f0f6bca6def6f6ee54546be01;hb=a8a7c2e12d1ea0413488abfee810c54adabd551e;hp=18b22ad08e29cca8a1f033d1414690c985e24f42;hpb=2bc57b3209e89d4beb3b669757c7f24193014a0b;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 18b22ad08e..1cb01b5c9b 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -1,17 +1,16 @@ depth = .. STEPMAKE_TEMPLATES=metafont install install-out -LOCALSTEPMAKE_TEMPLATES=asciifont include $(depth)/make/stepmake.make AF_FILES = $(wildcard *.af) -EXTRA_DIST_FILES += README feta.tex +EXTRA_DIST_FILES += README feta.tex cmr.enc # We don't use $(MF_FILES), because there's more .mf cruft here FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\ - $(wildcard feta-braces*[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) @@ -24,22 +23,44 @@ LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log) 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) +ENC_FILES = $(TEXTABLES:.tex=.enc) $(outdir)/cmr.enc TFM_FILES = $(FETA_MF_FILES:%.mf=$(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),) + +# only for fonts which +# +# 1. are mentioned in font.scm +# +# 2. are not included with teTeX +# +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 + +ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS) +PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) +PFB_FILES = $(PFA_FILES:%.pfa=%.pfb) + # 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) +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 #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 +INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 7 INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) @@ -50,22 +71,17 @@ INSTALLATION_OUT_FILES2=$(AFM_FILES) INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm INSTALLATION_OUT_FILES3=$(TFM_FILES) -SAUTER_FONTS = cmbxti7 cmbxti8 cmbxti12 cmbxti14 \ - cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17 cmtt6 cmbx6 cmbx5 cmbxti5 \ - cmti6 cmti5 cmss5 cmss6 cmss7 - -ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS) +INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/ly +INSTALLATION_OUT_FILES4=$(FETA_LIST_FILES) +INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/fonts/type1 +INSTALLATION_OUT_FILES5=$(PFA_FILES) $(outdir)/fonts.scale $(outdir)/Fontmap $(outdir)/Fontmap.lily -PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) -PFB_FILES = $(PFA_FILES:%.pfa=%.pfb) +INSTALLATION_OUT_DIR6=$(local_lilypond_datadir)/dvips/ +INSTALLATION_OUT_FILES6=$(outdir)/lilypond.map -ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale -INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/type1 -INSTALLATION_OUT_FILES4=$(PFA_FILES) $(outdir)/fonts.scale - -INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/dvips/ -INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map +INSTALLATION_OUT_DIR7=$(local_lilypond_datadir)/ps/ +INSTALLATION_OUT_FILES7=$(ENC_FILES) export MFINPUTS:=.:$(MFINPUTS) @@ -73,7 +89,7 @@ default: pfa_warning $(ALL_GEN_FILES) pfa_warning: -ifneq ($(basename $(MFTRACE)),mftrace) +ifneq ($(notdir $(MFTRACE)),mftrace) @echo "" @echo "ERROR: mftrace not found" @echo "" @@ -93,7 +109,7 @@ endif debian-mirror=http://ftp.us.debian.org debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb $(outdir)/$(debian-package): - wget -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package) + wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package) get-deb-pfa: $(outdir)/$(debian-package) rm -rf $(outdir)/./usr @@ -105,9 +121,10 @@ get-deb-pfa: $(outdir)/$(debian-package) redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm $(outdir)/$(redhat-package): - wget -P $(outdir) ftp://ftp.lilypond.org/pub/LilyPond/binaries/RedHat-9/$(redhat-package) + wget --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-1/$(redhat-package) get-rpm-pfa: $(outdir)/$(redhat-package) + cd $(outdir) ; rm -rf usr/ # (root alert!) cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS))) cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/ @@ -118,10 +135,10 @@ get-pfa: get-rpm-pfa ## ## todo: this also depends on .tfm, FIXME. -$(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm +$(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$( $@ 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) @@ -171,3 +202,5 @@ $(SAUTER_FONTS:%=$(outdir)/%.bla): $(outdir)/%.pfa: $(outdir)/%.bla $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@)) && mv $(notdir $@) $(outdir)/ +$(outdir)/%.enc: %.enc + cp $< $@