X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpango-font.hh;h=c0d6ff336863d7ff022005257a1276b2eb612a39;hb=ac1340846e81661575ba3036b251e8ab55b13023;hp=44c2bf4e5b5efc67d82b6d41393742e2b4ac4ade;hpb=1c8fbe4dc400ab5b40d4adf69d78e6ee71b2dea8;p=lilypond.git

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 44c2bf4e5b..c0d6ff3368 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PANGO_FONT_HH
@@ -15,9 +15,8 @@
 
 #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
 {
@@ -29,22 +28,22 @@ class Pango_font : public Font_metric
   SCM physical_font_tab_;
   Direction text_direction_;
 
-  map<string, Index_to_charcode_map > charcode_maps_;
-
-  Index_to_charcode_map const *get_index_to_charcode_map (string postscript_name, FT_Face face);
 public:
   SCM physical_font_tab () const;
   Pango_font (PangoFT2FontMap *,
-	      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 const *, string) const;
+  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;
 };