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)
-
-# What are these?
-FET_FILES = $(filter-out $(TEST_FILES),\
- $(wildcard feta[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 parmesan[0-9]*.mf))\
+ $(wildcard feta-nummer*[0-9].mf)\
+ $(wildcard parmesan[0-9]*.mf)
-# No braces?
-FONT_FILES = $(filter-out $(TEST_FILES),\
- $(wildcard feta[0-9]*.mf)\
- $(wildcard feta-braces*[0-9].mf)\
- $(wildcard feta-din*[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)))
-ENC_FILES=$(TEXTABLES:.tex=.enc)
-TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
-fet:
- echo $(FET_FILES)
+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
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
-#MAKE_PFB_FILES=1
-
+SAUTER_FONTS = cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
+ cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17 cmtt6 cmbx6 cmbx5 cmbxti5 \
+ cmti6 cmti5
-SAUTER_FONT_FILES=cmbxti7 cmbxti8 cmbxti12 cmbxti14 cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17
-#PFA_FILES= $(addprefix $(outdir)/, $(addsuffix .pfa, $(SAUTER_FONT_FILES)) $(FONT_FILES:.mf=.pfa))
-#PFA_FILES= $(addprefix $(outdir)/, $(addsuffix .pfa, $(SAUTER_FONT_FILES)))
-#PFB_FILES= $(addprefix $(outdir)/, $(addsuffix .pfb, $(SAUTER_FONT_FILES)) $(FONT_FILES:.mf=.pfb))
-#PFB_FILES= $(addprefix $(outdir)/, $(addsuffix .pfb, $(SAUTER_FONT_FILES)) $(FONT_FILES:.mf=.pfb))
+ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
-PFA_FILES=$(SAUTER_FONT_FILES:%=$(outdir)/%.pfa)
-PFA_FILES+=$(FONT_FILES:%.mf=$(outdir)/%.pfa)
-PFB_FILES=$(PFA_FILES:%.pfa=%.pfb)
+PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
+PFB_FILES = $(PFA_FILES:%.pfa=%.pfb)
-ifdef MAKE_PFB_FILES
-MAKE_PFA_FILES = 1
-ALL_GEN_FILES += $(PFB_FILES)
-endif
-
-ifdef MAKE_PFA_FILES
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
-endif
-
-ifdef MAKE_PFB_FILES
-INSTALLATION_OUT_FILES4 +=$(PFB_FILES)
-endif
export MFINPUTS:=.:$(MFINPUTS)
$(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm
$(PYTHON) $(buildscript-dir)/mf-to-table.py --package=$(topdir) --outdir=$(outdir) --dep $(outdir)/$(<F:.log=.dep) --afm $(outdir)/$(<F:.log=.afm) --enc $(outdir)/$(<F:.log=.enc) --tex $(outdir)/$(<F:.log=.tex) --ly $(outdir)/$(<F:.log=list.ly) $<
-fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd fonts.scale fonts.dir)
+fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir)
+
+## Urg
+mapentry=$(1) $(shell fgrep FontName $(outdir)/$(1).afm | sed -e 's/FontName *//') <$(1).pfaX
+
+map = $(foreach a,$(2),$(call $(1),$(a)))
+$(outdir)/lilypond.xmap: $(AFM_FILES)
+ echo '$(call map,mapentry,$(ALL_FONTS))' | \
+ tr 'X' '\n' | sed -e 's/^ *//'> $@
+
+# 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)/lilypond.map:
- echo $(notdir $(PFA_FILES:.pfa=)) | tr ' ' '\n' | \
- sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@
$(outdir)/fonts.scale: $(PFA_FILES)
-# cd $(outdir) && echo $(FONT_FILES:.mf=.pfa) $(FONT_FILES:.mf=.pfb) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $(@F)
+# 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
# Sketch map file
$(outdir)/lilypond.sfd:
-# cd $(outdir) && echo sketch $(FONT_FILES:.mf=.pfa) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py > $(@F)
+# 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
pfb: afm $(PFB_FILES) fontdir
# needed for web documentation
-$(SAUTER_FONT_FILES:%=$(outdir)/%.pfa):
- $(foreach i, $(SAUTER_FONT_FILES), \
+$(SAUTER_FONTS:%=$(outdir)/%.pfa):
+ $(foreach i, $(SAUTER_FONTS), \
$(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(i) && mv $(i).pfa $(outdir)/ && ) true
-$(SAUTER_FONT_FILES:%=$(outdir)/%.pfb):
- $(foreach i, $(SAUTER_FONT_FILES), \
+$(SAUTER_FONTS:%=$(outdir)/%.pfb):
+ $(foreach i, $(SAUTER_FONTS), \
$(MFTRACE) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(i) && mv $(i).pfb $(i).pfa $(outdir)/ && ) true
projects / lilypond.git / blobdiff