* 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.

diff --git a/ChangeLog b/ChangeLog
index c192f3ed2613bf5667d84493d1f323073c5b098d..916b06837c011ed6c7373d1c340c4891b4b7bd0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-05-02  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 29f1b0014f08f42624cf541286445519dfd91fdc..c4f54f6e589f5c3fa5111c34a4096d9af3643b46 100644 (file)
--- 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 040d106606db5d38a81a444397f750717440de5b..52f185ecb67c17eb30718adaff647c198922a7ef 100644 (file)
--- 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 <emmentaler-$$i.cff.ps";\
-               echo "$(PFA_PREFIX)Emmentaler-$$i $(PFA_PREFIX)Emmentaler-$$i <$(PFA_PREFIX)emmentaler-$$i.pfa";\
-       done >> $@
-       echo "Aybabtu-Regular Aybabtu-Regular <aybabtu.cff.ps" >> $@
-       echo "$(PFA_PREFIX)Aybabtu-Regular $(PFA_PREFIX)Aybabtu-Regular <aybabtu.cff.ps" >> $@
-#
-# FIXME: needed for make web on Debian/unstable -- not in any other .map file  
-       echo "FreeSans FreeSans <FreeSans.ttf" >> $@
-       echo "Kochi-Gothic Kochi-Gothic <kochi-gothic.ttf" >> $@
-       
-$(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