Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 77139c08b88ba21b04ec2addb09c85e098017c00..dc21ccf684199089a65de939d4cd9569e5894818 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 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_PANGO_FT2
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
@@ -22,22 +22,28 @@
 class Pango_font : public Font_metric
 {
   PangoContext *context_;
-  PangoFontDescription *description_; 
+  PangoFontDescription *pango_description_;
   PangoAttrList *attribute_list_;
   Real scale_;
-  SCM subfonts_;
+  Real output_scale_;
+  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 *,
-             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;
+  void register_font_file (string, string);
+  Stencil text_stencil (string) const;
+  Stencil pango_item_string_stencil (PangoItem const *, string) const;
 
-  virtual SCM sub_fonts () const;
   virtual void derived_mark () const;
 };
 
@@ -52,6 +58,7 @@ Font_metric *
 select_pango_font (Output_def *layout, SCM chain);
 
 const int PANGO_RESOLUTION = 1200;
+PangoFontDescription *properties_to_pango_description (SCM chain, Real text_size);
 
 #endif /* HAVE_PANGO16 */
 #endif /* PANGO_FONT_HH */