Bugfix: Use actual fontname (.AFM FontName) for

lilypond.map.  Include sauter fonts too.  Cleanups.

diff --git a/ChangeLog b/ChangeLog
index 4d9acfa672acb9207ae0655a3200e2cb0dac91e4..e7ce3cb0cc6c32b7fcb78b8a68be0d44cdd077ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2002-11-03  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * mf/GNUmakefile: Bugfix: Use actual fontname (.AFM FontName) for
-       lilypond.map.
+       lilypond.map.  Include sauter fonts too.  Cleanups.
 
 2002-11-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index b801fafd0f982130a962e909369ab76274c6760b..933b4140c7a5441c56dc0c0882d78846911e4261 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -3,46 +3,28 @@ 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)
-
-# What are these?
-XXXFET_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))
-
-# No braces?
-FONT_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 feta-nummer*[0-9].mf)\
-       $(wildcard parmesan[0-9]*.mf))
-
-# let's see what happens
-FET_FILES=$(FONT_FILES)
+       $(wildcard parmesan[0-9]*.mf)
 
-XPM_FONTS = feta20 feta-nummer10 feta-braces20
-#CM_AFM_FILES = cmr10
+FETA_FONTS = $(FETA_MF_FILES:.mf=)
 
-$(outdir)/cmr10.afm:
-       -$(GUILE) $(buildscript-dir)/tfm2oafm.scm `kpsewhich cmr10.tfm`
-       -mv $(@F) $@
+XPM_FONTS = feta20 feta-din10 feta-nummer10 feta-braces20 parmesan20
 
-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))
+LOG_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.log)
+TEXTABLES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tex)
+AFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.afm)
+ENC_FILES = $(TEXTABLES:.tex=.enc)
+TFM_FILES = $(FETA_MF_FILES:%.mf=$(outdir)/%.tfm)
 
 
 # Make tfm files first, log files last, 
@@ -69,13 +51,14 @@ INSTALLATION_OUT_FILES3=$(TFM_FILES)
 #MAKE_PFA_FILES=1
 #MAKE_PFB_FILES=1
 
+SAUTER_FONTS = cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
+       cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17
 
-SAUTER_FONT_FILES=cmbxti7 cmbxti8 cmbxti12  cmbxti14 cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17
+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
@@ -110,18 +93,18 @@ fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd fonts.scale fonts.dir
 mapentry=$(1) $(shell fgrep FontName $(outdir)/$(1).afm | sed -e 's/FontName *//') <$(1).pfaX
 
 map = $(foreach a,$(2),$(call $(1),$(a)))
-$(outdir)/lilypond.xmap:
-       echo '$(call map,mapentry,$(FONT_FILES:%.mf=%))' | \
+$(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:
-       for i in $(FONT_FILES:%.mf=%); do echo $$i $$(fgrep FontName $(outdir)/$$i.afm | sed -e 's/FontName *//') '<'$$i.pfa; done > $@
-
+$(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 $(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
@@ -129,7 +112,7 @@ $(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)
 
 
@@ -142,9 +125,9 @@ pfa: afm $(PFA_FILES) fontdir
 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