Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / pango-font.cc

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index f91eafb9844743dd1a6ae89904e5c48ebb0f81b8..43766881c28e6ba7e0d9c7da6e735ba23678363f 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -23,6 +23,7 @@
 #include "string-convert.hh"
 #include "warn.hh"
 #include "all-font-metrics.hh"
+#include "program-option.hh"
 
 #if HAVE_PANGO_FT2
 #include "stencil.hh"
@@ -163,7 +164,9 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str,
        {
          int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN);
          if (errorcode)
-           programming_error ("FT_Get_Glyph_Name returns error");
+           programming_error (_f ("FT_Get_Glyph_Name () error: %s",
+                                  freetype_error_string (errorcode).c_str ()
+                                  ));
        }
 
       SCM char_id = SCM_EOL;
@@ -349,8 +352,8 @@ Pango_font::text_stencil (string str, bool tight) const
     UGH. Should have flags per output format signifying supported
     options.
   */
-  if (output_backend_global != "ps"
-      && output_backend_global != "eps")
+  string name = get_output_backend_name ();
+  if (name != "ps" && name != "eps")
     {
       /*
        For Pango based backends, we take a shortcut.