* lily/include/main.hh: rename format to backend.

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

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index fbdf13ba05a1717b10a7798c3de49dd40d7d1c84..dbd41e443bed15f0d96383676ee18c73b32fb00e 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -12,6 +12,7 @@
 
 #include <pango/pangoft2.h>
 
+#include "main.hh"
 #include "lookup.hh"
 #include "dimensions.hh"
 #include "pango-font.hh"
@@ -31,7 +32,7 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap,
   context_ =
     pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION);
 
-  description_ = pango_font_description_copy (description);
+  pango_description_ = pango_font_description_copy (description);
   //  context_ = pango_ft2_font_map_create_context (fontmap);  
   attribute_list_= pango_attr_list_new();
 
@@ -49,7 +50,7 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap,
 
 Pango_font::~Pango_font ()
 {
-  pango_font_description_free (description_);
+  pango_font_description_free (pango_description_);
   g_object_unref (context_);
   pango_attr_list_unref (attribute_list_);
 }
@@ -133,12 +134,6 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con
   return item_stencil;  
 }
 
-Stencil
-Pango_font::direct_pango_text_stencil (String str) const
-{
-
-
-}
 
 Stencil
 Pango_font::text_stencil (String str) const
@@ -164,14 +159,14 @@ Pango_font::text_stencil (String str) const
       ptr = ptr->next;      
     }
 
-  if (output_format_global != "ps")
+  if (output_backend_global != "ps")
     {
       /*
        For Pango based backends, we take a shortcut.
        */
       SCM exp
        = scm_list_3 (ly_symbol2scm ("utf-8-string"),
-                     scm_makfrom0str (pango_font_description_to_filename (description_)),
+                     scm_makfrom0str (pango_font_description_to_filename (pango_description_)),
                      scm_makfrom0str (str.to_str0 ()));