(pango_item_string_stencil): only use cmap

entry if cmap contains glyph.
(get_index_to_charcode_map): remove from Pango_font class, use
global filename -> font mapping.
(get_glyph_index_name): new function.
(pango_item_string_stencil): use glyphIndexXXXX as glyph name,
only for TTF.

diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc
index 27e5db98804752020a1460fb1cff339eac7f1398..b18aae42da06a64807208f0a9c3ea616de7ae153 100644 (file)
--- a/lily/music-scheme.cc
+++ b/lily/music-scheme.cc
@@ -6,12 +6,12 @@
   (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "music.hh"
+
 #include "duration.hh"
 #include "warn.hh"
-#include "music.hh"
 #include "pitch.hh"
 
-
 LY_DEFINE (ly_music_length, "ly:music-length",
           1, 0, 0, (SCM mus),
           "Get the length of music expression @var{mus}, and return as a @code{Moment} object.")

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 7da47e6672a3e9885b52984eea3eca86b9238d62..5592c76ba68560f921bc2542d72ff45f8cca0de0 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -162,6 +162,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
     cmap = get_index_to_charcode_map (file_name, ftface);
   bool is_ttf = (file_name.find (".ttf") != NPOS
                 || file_name.find (".TTF") != NPOS);
+  
   bool cid_keyed = false;
   for (int i = 0; i < pgs->num_glyphs; i++)
     {