* The grand 2005-2006 replace.

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

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 08e21edc553c5d6c1613fa59f1e4562f0580a7f8..852e73e28e8a6d222b5240c699618a455c866af2 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef 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,14 +22,15 @@
 class Pango_font : public Font_metric
 {
   PangoContext *context_;
-  PangoFontDescription *pango_description_; 
+  PangoFontDescription *pango_description_;
   PangoAttrList *attribute_list_;
   Real scale_;
-  SCM subfonts_;
-  
+  Real output_scale_;
+  SCM physical_font_tab_;
+  Direction text_direction_; 
 public:
+  SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
-             Direction leftright,
              PangoFontDescription *,
              Real);
   ~Pango_font ();
@@ -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 const *, String) const;
 
-  virtual SCM sub_fonts () const;
   virtual void derived_mark () const;
 };