X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpango-font.hh;h=93ac7c11f896629899ef42667625071b3798abcc;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=31b858f14343c9782360360509722175adcd412c;hpb=235a33ac0d166718d2a6f07069a6ffb2c5acaf34;p=lilypond.git

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 31b858f143..93ac7c11f8 100644
--- 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PANGO_FONT_HH
@@ -11,35 +11,39 @@
 
 #include "config.hh"
 
-#ifdef HAVE_PANGO16
+#if HAVE_PANGO_FT2
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
-#include "font-metric.hh"
 
-#include "open-type-font.hh"
+#include "font-metric.hh"
 
 class Pango_font : public Font_metric
 {
   PangoContext *context_;
-  PangoFontDescription *pango_description_; 
+  PangoFontDescription *pango_description_;
   PangoAttrList *attribute_list_;
   Real scale_;
+  Real output_scale_;
   SCM physical_font_tab_;
+  Direction text_direction_;
 
 public:
-  SCM physical_font_tab () const; 
+  SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
-	      Direction leftright,
-	      PangoFontDescription *,
+	      PangoFontDescription const *,
 	      Real);
   ~Pango_font ();
 
+  string description_string () const; 
   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;
+  void register_font_file (string, string);
+  Stencil text_stencil (string, bool tight) const;
+
+  Stencil pango_item_string_stencil (PangoItem const *, string, bool tight) const;
 
+  virtual Stencil word_stencil (string) const;
+  virtual Stencil text_stencil (string) const;
   virtual void derived_mark () const;
 };