Bugfix: Use actual fontname (.AFM FontName) for

lilypond.map.

diff --git a/ChangeLog b/ChangeLog
index bb3a41dc70aeec3936c329d2186c2f9c3f7c48a8..4d9acfa672acb9207ae0655a3200e2cb0dac91e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
+2002-11-03  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * mf/GNUmakefile: Bugfix: Use actual fontname (.AFM FontName) for
+       lilypond.map.
+
 2002-11-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * Documentation/user/tutorial.itely (First steps): change to new
        chord/tie/slur/beam notation.
 
-       * lily/parser.yy (event_that_take_dir): allow postfix notation for ties.
+       * lily/parser.yy (event_that_take_dir): allow postfix notation for
+       ties.
 
        * lily/new-tie-engraver.cc (process_acknowledged_grobs): new
        engraver. Process ties in postfix notation, i.e. c8-~ c

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 12943966d5751d5fe731dd1f3f7db05764fde4f8..b801fafd0f982130a962e909369ab76274c6760b 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -106,9 +106,19 @@ $(outdir)/%.afm  $(outdir)/%.enc  $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.l
 
 fontdir: $(addprefix $(outdir)/, lilypond.map lilypond.sfd fonts.scale fonts.dir)
 
-$(outdir)/lilypond.map: 
-       echo $(notdir $(PFA_FILES:.pfa=)) | tr ' ' '\n' | \
-               sed 's/\(.*\)/\1 \1 <\1.pfa/' > $@
+## Urg
+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=%))' | \
+               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)/fonts.scale: $(PFA_FILES)
 #      cd $(outdir) && echo $(FONT_FILES:.mf=.pfa) $(FONT_FILES:.mf=.pfb) | $(PYTHON) $(topdir)/buildscripts/make-font-dir.py  > $(@F)