(pango_item_string_stencil): only use uXXX

glyphnames if we have a ttf font.

diff --git a/ChangeLog b/ChangeLog
index 3e53998cb0d218e3b5a9e3d14a8a076f203e0432..5e7984611b328476c77ffb087e032a6240322ac3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-30  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/pango-font.cc (pango_item_string_stencil): only use uXXX
+       glyphnames if we have a ttf font.
+
 2006-03-30  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Documentation/user/advanced-notation.itely (Font selection):

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 0dd963386040866fe62a92ddfce594c3ecc75fb8..1faa34fc40bb592f0c716a6a84cf45923b6d81cf 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -154,7 +154,12 @@ 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;
-      if (glyph_name[0] == '\0' && cmap)
+      if (glyph_name[0] == '\0'
+         && cmap
+
+         /* Ugh should ask FreeType about font type. */
+         && (file_name.find (".ttf") != NPOS
+             || file_name.find (".TTF") != NPOS))
        {
          FT_ULong char_code = cmap->find (pg)->second;
          get_unicode_name (glyph_name, char_code);

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index e983457bb7c7120d92c9218f373fb8c4ceea989b..270eb06489eb16536889de9b9aacb8a6fda4824d 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -84,7 +84,7 @@ $(outdir)/aybabtu.fontname:
 $(outdir)/aybabtu.subfonts:
        echo $(subst .mf,,$(call src-wildcard,feta-braces-[a-z].mf)) > $@
 
-$(outdir)/pe-script-canary: $(buildscript-dir)/gen-emmentaler-scripts.py
+$(PE_SCRIPTS) $(outdir)/pe-script-canary: $(buildscript-dir)/gen-emmentaler-scripts.py
        $(PYTHON) $< --dir=$(outdir)
 
 $(outdir)/fonts.cache-1: $(PFA_FILES) $(OTF_FILES)