* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.

[lilypond.git] / lily / include / pango-font.hh

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 08e21edc553c5d6c1613fa59f1e4562f0580a7f8..b8119b746aa57e885922ac1982b194008eee8757 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -11,7 +11,7 @@
 
 #include "config.hh"
 
-#ifdef HAVE_PANGO16
+#if HAVE_PANGO16
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
@@ -22,12 +22,13 @@
 class Pango_font : public Font_metric
 {
   PangoContext *context_;
-  PangoFontDescription *pango_description_; 
+  PangoFontDescription *pango_description_;
   PangoAttrList *attribute_list_;
   Real scale_;
-  SCM subfonts_;
-  
+  SCM physical_font_tab_;
+
 public:
+  SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
              Direction leftright,
              PangoFontDescription *,
@@ -37,9 +38,8 @@ public:
   SCM font_file_name () const;
   void register_font_file (String, String);
   Stencil text_stencil (String) const;
-  Stencil pango_item_string_stencil (PangoItem*, String, Real) const;
+  Stencil pango_item_string_stencil (PangoItem *, String, Real) const;
 
-  virtual SCM sub_fonts () const;
   virtual void derived_mark () const;
 };