From 975a4ea2b6b1a50c66ada93b5b67adc74d03134f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 17 Dec 2004 13:13:50 +0000 Subject: [PATCH] remove AFM support. --- ChangeLog | 2 ++ mf/GNUmakefile | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 181eb347f3..7eddc741cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-12-17 Han-Wen Nienhuys + * mf/GNUmakefile: remove AFM support. + * buildscripts/mf-to-table.py (base): remove AFM support. * lily/open-type-font.cc (design_size): use design_size diff --git a/mf/GNUmakefile b/mf/GNUmakefile index ceb252c2c7..4ed5631f66 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -34,8 +34,6 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable) 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))) FETA_LIST_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%list.ly) @@ -93,7 +91,7 @@ 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) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale $(outdir)/Fontmap.lily $(CHEESES) +ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale $(outdir)/Fontmap.lily $(CHEESES) #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source @@ -104,9 +102,6 @@ INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6 7 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_DIR3=$(local_lilypond_datadir)/fonts/tfm INSTALLATION_OUT_FILES3=$(TFM_FILES) @@ -172,8 +167,8 @@ get-pfa: get-rpm-pfa ## ## todo: this also depends on .tfm, FIXME. -$(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.afm $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%list.ly $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm - $(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(