From 11d798c148ed70ecbfdf682c5588b4bf6636dcec Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 20 Oct 2006 16:51:48 +0000 Subject: [PATCH] (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. --- lily/music-scheme.cc | 4 ++-- lily/pango-font.cc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lily/music-scheme.cc b/lily/music-scheme.cc index 27e5db9880..b18aae42da 100644 --- a/lily/music-scheme.cc +++ b/lily/music-scheme.cc @@ -6,12 +6,12 @@ (c) 2005--2006 Han-Wen Nienhuys */ +#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 7da47e6672..5592c76ba6 100644 --- 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++) { -- 2.39.5