(pango_item_string_stencil): use
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Sun, 22 Oct 2006 15:14:16 +0000 (15:14 +0000)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Sun, 22 Oct 2006 15:14:16 +0000 (15:14 +0000)
FT_Get_X11_Font_Format()

ChangeLog
VERSION
lily/pango-font.cc

index 28faf7585ddc66695c91fabc300a9a9b038afac3..2f001503f623f9d0a6edceef6069867bfc7ab2bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2006-10-22  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/pango-font.cc (pango_item_string_stencil): use
+       FT_Get_X11_Font_Format()
+
 2006-10-22  John Mandereau  <john.mandereau@free.fr>
 
        * po/fr.po: update translation.
 
 2006-10-21  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * 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 f651c842128b2434acb3f2ba475e9cec16624515..597888e2cd739367f73307a63a8c39ba044d5070 100644 (file)
--- 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=
 
index 5592c76ba68560f921bc2542d72ff45f8cca0de0..322b50c7774c9cb637ab97e6413fa37f4d23dc0e 100644 (file)
@@ -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,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++)
     {