(pango_item_string_stencil): only use cmap

entry if cmap contains glyph.

diff --git a/ChangeLog b/ChangeLog
index 1d96c8bcec0802a47861935d700557eaba9852ab..5495d56b808cd4783bc68974424303ce50482672 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/pango-font.cc (pango_item_string_stencil): only use cmap
+       entry if cmap contains glyph.
+
        * scripts/lilypond-book.py (main): use -deps-box-padding=-3
 
        * scm/framework-ps.scm (dump-stencil-as-EPS): use eps-box-padding,

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index a79c237013d44f4f3e71511da316d352fb9f7d35..63029b3bbcd4593b9ca55ed320669ce9f8c68e45 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -173,7 +173,8 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
 
          /* Ugh should ask FreeType about font type. */
          && (file_name.find (".ttf") != NPOS
-             || file_name.find (".TTF") != NPOS))
+             || file_name.find (".TTF") != NPOS)
+         && cmap->find (pg) != cmap->end ())
        {
          FT_ULong char_code = cmap->find (pg)->second;
          get_unicode_name (glyph_name, char_code);