CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/05/02 19:15:13

Modified files:
        .              : ChangeLog 
        buildscripts   : gen-emmentaler-scripts.py 
        mf             : GNUmakefile 

Log message:
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3526&tr2=1.3527&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/gen-emmentaler-scripts.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/GNUmakefile.diff?tr1=1.157&tr2=1.158&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3526 lilypond/ChangeLog:1.3527
--- lilypond/ChangeLog:1.3526   Mon May  2 14:36:17 2005
+++ lilypond/ChangeLog  Mon May  2 19:15:12 2005
@@ -1,5 +1,11 @@
 2005-05-02  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
+       * 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.
 
Index: lilypond/buildscripts/gen-emmentaler-scripts.py
diff -u lilypond/buildscripts/gen-emmentaler-scripts.py:1.10 
lilypond/buildscripts/gen-emmentaler-scripts.py:1.11
--- lilypond/buildscripts/gen-emmentaler-scripts.py:1.10        Sun Apr 17 
21:16:31 2005
+++ lilypond/buildscripts/gen-emmentaler-scripts.py     Mon May  2 19:15:13 2005
@@ -71,6 +71,7 @@
 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()
 
Index: lilypond/mf/GNUmakefile
diff -u lilypond/mf/GNUmakefile:1.157 lilypond/mf/GNUmakefile:1.158
--- lilypond/mf/GNUmakefile:1.157       Tue Apr 19 17:18:10 2005
+++ lilypond/mf/GNUmakefile     Mon May  2 19:15:13 2005
@@ -228,28 +228,6 @@
 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


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to