X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fpango-font.hh;h=b8119b746aa57e885922ac1982b194008eee8757;hb=2a6f7d1f45438eae0b46636d43da07b36db53273;hp=36aa04c391a95a1127b29970e355c680d6945726;hpb=254f634d6e541adeea359a557ea9c9ad8860131c;p=lilypond.git

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 36aa04c391..b8119b746a 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 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2005 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,20 +22,24 @@
 class Pango_font : public Font_metric
 {
   PangoContext *context_;
+  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 *);
+	      PangoFontDescription *,
+	      Real);
   ~Pango_font ();
 
   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;
 
-  virtual SCM sub_fonts () const;
   virtual void derived_mark () const;
 };
 
@@ -44,13 +48,13 @@ symbols_to_pango_font_description (SCM family,
 				   SCM style,
 				   SCM variant,
 				   SCM weight,
-				   SCM stretch,
-				   Real size);
+				   SCM stretch);
 
 Font_metric *
 select_pango_font (Output_def *layout, SCM chain);
 
-const int PANGO_DPI = 1200;
+const int PANGO_RESOLUTION = 1200;
+PangoFontDescription *properties_to_pango_description (SCM chain, Real text_size);
 
 #endif /* HAVE_PANGO16 */
 #endif /* PANGO_FONT_HH */