From a6f86f6c52689872a64cfd2cab3744eb3a881f76 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 2 May 2005 19:15:13 +0000 Subject: [PATCH] * mf/GNUmakefile ($(outdir)/lilypond.map): remove rule. ($(outdir)/Fontmap.lily): idem. * buildscripts/gen-emmentaler-scripts.py (i): load fetaXX encoding for PFAEmmentaler-XXX.pfa. This fixes ghostscript ps2pdf problems. --- ChangeLog | 6 ++++++ buildscripts/gen-emmentaler-scripts.py | 1 + mf/GNUmakefile | 22 ---------------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c192f3ed26..916b06837c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-05-02 Han-Wen Nienhuys + * mf/GNUmakefile ($(outdir)/lilypond.map): remove rule. + ($(outdir)/Fontmap.lily): idem. + + * buildscripts/gen-emmentaler-scripts.py (i): load fetaXX encoding + for PFAEmmentaler-XXX.pfa. This fixes ghostscript ps2pdf problems. + * Documentation/user/music-glossary.tely (accidental): NL translation of accidental. diff --git a/buildscripts/gen-emmentaler-scripts.py b/buildscripts/gen-emmentaler-scripts.py index 29f1b0014f..c4f54f6e58 100644 --- a/buildscripts/gen-emmentaler-scripts.py +++ b/buildscripts/gen-emmentaler-scripts.py @@ -71,6 +71,7 @@ Generate("%(filename)s-%(design_size)d.svg"); SetFontNames("PFA%(name)s-%(design_size)d", "PFA%(name)s", "PFA%(name)s %(design_size)d", "%(design_size)d", "GNU GPL", "@TOPLEVEL_VERSION@"); # different name to prevent conflict with OTF +LoadEncodingFile("feta%(design_size)d.enc"); Generate("PFA%(filename)s-%(design_size)d.pfa"); ''' % vars() diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 040d106606..52f185ecb6 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -228,28 +228,6 @@ $(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc $(outdir)/%.tex $(outdi fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd private-fonts fonts.scale fonts.dir Fontmap.lily) -$(outdir)/lilypond.map: GNUmakefile - for i in $(FETA_FONTS); do echo $$i $$i '<'$$i.pfa; done > $@ - for i in $(STAFF_SIZES); do\ - echo "Emmentaler-$$i Emmentaler-$$i > $@ - echo "Aybabtu-Regular Aybabtu-Regular > $@ - echo "$(PFA_PREFIX)Aybabtu-Regular $(PFA_PREFIX)Aybabtu-Regular > $@ -# -# FIXME: needed for make web on Debian/unstable -- not in any other .map file - echo "FreeSans FreeSans > $@ - echo "Kochi-Gothic Kochi-Gothic > $@ - -$(outdir)/Fontmap.lily: GNUmakefile - for i in $(FETA_FONTS); do echo "/$$i ($$i.pfa);" ; done > $@ - for i in $(STAFF_SIZES); do \ - echo "/Emmentaler-$$i (emmentaler-$$i.cff.ps);" ; \ - echo "/$(PFA_PREFIX)Emmentaler-$$i ($(PFA_PREFIX)emmentaler-$$i.pfa);" \ - done >> $@ - echo "/Aybabtu (aybabtu.cff.ps);" >> $@ - echo "/$(PFA_PREFIX)Aybabtu ($(PFA_PREFIX)aybabtu.pfa);" >> $@ - local-clean: rm -f mfplain.mem mfplain.log rm -f *.tfm *.log -- 2.39.5