X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mf%2FGNUmakefile;h=88d89a4c8d8301b08b3b2e7747e6c0886c55aed4;hb=1753b1a73742a5b0893037116bb6f2febba277f3;hp=ab77ff12b919fc6e825aa5048ad5c1b7809f9f13;hpb=ee9d99190ecd2a054322eabca66b1e0c2507474f;p=lilypond.git diff --git a/mf/GNUmakefile b/mf/GNUmakefile index ab77ff12b9..88d89a4c8d 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -3,83 +3,124 @@ 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 -# don't try to make fonts from test files -TEST_FILES = $(wildcard *test*.mf) -FET_FILES = $(filter-out $(TEST_FILES),\ - $(wildcard feta[0-9]*.mf) $(wildcard parmesan[0-9]*.mf)) -FONT_FILES = $(filter-out $(TEST_FILES),\ -$(wildcard feta*[0-9].mf) $(wildcard parmesan*[0-9].mf)) +# 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-din*[0-9].mf)\ + $(wildcard feta-nummer*[0-9].mf)\ + $(wildcard parmesan[0-9]*.mf) + +FETA_FONTS = $(FETA_MF_FILES:.mf=) -XPM_FONTS = feta20 feta-nummer10 feta-braces20 -#CM_AFM_FILES = cmr10 +XPM_FONTS = feta20 feta-din10 feta-nummer10 feta-braces20 parmesan20 -$(outdir)/cmr10.afm: - -$(GUILE) $(buildscript-dir)/tfm2oafm.scm `kpsewhich cmr10.tfm` - -mv $(@F) $@ +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) +TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm) -LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log) $(PARMESAN_FILES:.mf=.log)) -TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex) $(PARMESAN_FILES:.mf=.tex)) -AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(PARMESAN_FILES:.mf=.afm) $(AF_FILES:.af=.afm) $(addsuffix .afm, $(CM_AFM_FILES))) -TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm)) +ENCODING_FILE=$(findstring $(<:.mf=.enc), $(FETA_MF_FILES:.mf=.enc)) +MFTRACE_FLAGS=$(if $(ENCODING_FILE),--encoding $(ENCODING_FILE),) # 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) +ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" -INSTALLATION_DIR=$(datadir)/fonts/source +INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source INSTALLATION_FILES=$(MF_FILES) $(AF_FILES) INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 -INSTALLATION_OUT_DIR1=$(datadir)/tex +INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex INSTALLATION_OUT_FILES1=$(TEXTABLES) -INSTALLATION_OUT_DIR2=$(datadir)/fonts/afm +INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/fonts/afm INSTALLATION_OUT_FILES2=$(AFM_FILES) -INSTALLATION_OUT_DIR3=$(datadir)/fonts/tfm +INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm INSTALLATION_OUT_FILES3=$(TFM_FILES) -# comment this out if you don't want pfa's to be generated -# making pfas takes a lot of CPU time. Let's skip it for now. -#MAKE_PFA_FILES=1 +SAUTER_FONTS = cmbxti7 cmbxti8 cmbxti12 cmbxti14 \ + cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17 cmtt6 cmbx6 cmbx5 cmbxti5 \ + cmti6 cmti5 -PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) -ifdef MAKE_PFA_FILES -ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map -INSTALLATION_OUT_DIR4=$(datadir)/fonts/type1 -INSTALLATION_OUT_FILES4=$(PFA_FILES) +ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS) -INSTALLATION_OUT_DIR5=$(datadir)/dvips/ -INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map -endif +PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa) +PFB_FILES = $(PFA_FILES:%.pfa=%.pfb) + +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 export MFINPUTS:=.:$(MFINPUTS) default: $(ALL_GEN_FILES) -$(outdir)/lilypond.map: - echo $(FONT_FILES:.mf=) | tr ' ' '\n' | \ - sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@ - ## ## todo: this also depends on .tfm, FIXME. -$(outdir)/%.afm $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log - $(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(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)/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 -pfa: $(PFA_FILES) - +afm: $(AFM_FILES) +pfa: afm $(PFA_FILES) fontdir +pfb: afm $(PFB_FILES) fontdir + +# needed for web documentation +$(SAUTER_FONTS:%=$(outdir)/%.pfa): + $(foreach i, $(SAUTER_FONTS), \ + $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(i) && mv $(i).pfa $(outdir)/ && ) true +$(SAUTER_FONTS:%=$(outdir)/%.pfb): + $(foreach i, $(SAUTER_FONTS), \ + $(MFTRACE) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(i) && mv $(i).pfb $(i).pfa $(outdir)/ && ) true