Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / lily / pango-font.cc

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 7da47e6672a3e9885b52984eea3eca86b9238d62..e075029154b68ed7cb7638f8ddced5106957a11b 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -8,6 +8,7 @@
 
 #define PANGO_ENABLE_BACKEND // ugh, why necessary?
 #include <pango/pangoft2.h>
+#include <freetype/ftxf86.h>
 
 /* Ugh.  */
 #include "pango-font.hh"
@@ -160,8 +161,8 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
   bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES;
   if  (! has_glyph_names)
     cmap = get_index_to_charcode_map (file_name, ftface);
-  bool is_ttf = (file_name.find (".ttf") != NPOS
-                || file_name.find (".TTF") != NPOS);
+
+  bool is_ttf = string (FT_Get_X11_Font_Format (ftface)) == "TrueType";
   bool cid_keyed = false;
   for (int i = 0; i < pgs->num_glyphs; i++)
     {
@@ -177,12 +178,10 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
          if (errorcode)
            programming_error ("FT_Get_Glyph_Name returns error");
        }
-      
+
       SCM char_id = SCM_EOL;
       if (glyph_name[0] == '\0'
          && cmap
-
-         /* Ugh should ask FreeType about font type. */
          && is_ttf
          && cmap->find (pg) != cmap->end ())
        {
@@ -199,6 +198,10 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
          continue;
        }
 
+      
+      if (glyph_name == string (".notdef") && is_ttf)
+       glyph_name[0] = '\0';
+         
       if (glyph_name[0] == '\0' && is_ttf)
        {
          // access by glyph index directly.