* mf/GNUmakefile ($(outdir)/emmentaler-%.otf

$(outdir)/emmentaler-%.svg): remove canary.

* lily/pango-font.cc (pango_item_string_stencil): only use uXXX
glyphnames if we have a ttf font.

diff --git a/ChangeLog b/ChangeLog
index 5e7984611b328476c77ffb087e032a6240322ac3..3844774ef2c52c2a65b2863c6e1ede0fe598ddde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-03-30  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * mf/GNUmakefile ($(outdir)/emmentaler-%.otf
+       $(outdir)/emmentaler-%.svg): remove canary.
+
        * lily/pango-font.cc (pango_item_string_stencil): only use uXXX
        glyphnames if we have a ttf font.
 

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 1faa34fc40bb592f0c716a6a84cf45923b6d81cf..f6f42536898779eeccd73070b6a57e62d398a147 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -153,7 +153,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const
 
       FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN);
 
-      SCM char_id;
+      SCM char_id = SCM_EOL;
       if (glyph_name[0] == '\0'
          && cmap
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 270eb06489eb16536889de9b9aacb8a6fda4824d..b19b3400d150d039db71b59c1729703c66b30c15 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -61,7 +61,7 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable)
 #
 
 
-$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/pe-script-canary $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa  $(outdir)/feta-alphabet%.pfa  $(outdir)/parmesan%.pfa
+$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa  $(outdir)/feta-alphabet%.pfa  $(outdir)/parmesan%.pfa
        cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe)
 
 $(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa)
@@ -84,7 +84,7 @@ $(outdir)/aybabtu.fontname:
 $(outdir)/aybabtu.subfonts:
        echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
-$(PE_SCRIPTS) $(outdir)/pe-script-canary: $(buildscript-dir)/gen-emmentaler-scripts.py
+$(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts.py
        $(PYTHON) $< --dir=$(outdir)
 
 $(outdir)/fonts.cache-1: $(PFA_FILES) $(OTF_FILES)