X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=aa2c7f35c40410964a24a02bbadb642b6fbd8ded;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=10cca5bfaf7734cec57c6f039043ee4f853a6f8f;hpb=91f01637f31c7d904fd8016b49184e935bf1c8ab;p=lilypond.git

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index 10cca5bfaf..aa2c7f35c4 100644
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #define PANGO_ENABLE_BACKEND // ugh, why necessary?
@@ -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,8 +164,8 @@ 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 (_f ("FT_Get_Glyph_Name() error: %s",
-				   freetype_error_string (errorcode).c_str()
+	    programming_error (_f ("FT_Get_Glyph_Name () error: %s",
+				   freetype_error_string (errorcode).c_str ()
 				   ));
 	}
 
@@ -351,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.