From 01e5fdc14e5ac7f49a6e71a92bec3554aa4e0a29 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 22 Oct 2006 15:14:16 +0000 Subject: [PATCH] (pango_item_string_stencil): use FT_Get_X11_Font_Format() --- ChangeLog | 9 +++++++++ VERSION | 2 +- lily/pango-font.cc | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28faf7585d..2f001503f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,16 @@ +2006-10-22 Han-Wen Nienhuys + + * lily/pango-font.cc (pango_item_string_stencil): use + FT_Get_X11_Font_Format() + 2006-10-22 John Mandereau * po/fr.po: update translation. 2006-10-21 Han-Wen Nienhuys + * VERSION (PATCH_LEVEL): bump version + * input/regression/horizontal-bracket-break.ly: new file. * scm/define-grobs.scm (all-grob-descriptions): calc @@ -12,6 +19,8 @@ * lily/horizontal-bracket.cc (make_bracket): support connect-to-neighbor. Fix #118 + * VERSION: release 2.9.26-2 + * lily/ttf.cc (make_index_to_charcode_map): remove debugging gobs. * VERSION (PACKAGE_NAME): release 2.9.26 diff --git a/VERSION b/VERSION index f651c84212..597888e2cd 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=9 -PATCH_LEVEL=26 +PATCH_LEVEL=27 MY_PATCH_LEVEL= diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 5592c76ba6..322b50c777 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -8,6 +8,7 @@ #define PANGO_ENABLE_BACKEND // ugh, why necessary? #include +#include /* Ugh. */ #include "pango-font.hh" @@ -160,9 +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)) == "TrueType6"; bool cid_keyed = false; for (int i = 0; i < pgs->num_glyphs; i++) { -- 2.39.2