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 b3d4ebd934758cdde5ba9724cf484dd0438bb642..dc21ccf684199089a65de939d4cd9569e5894818 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -11,7 +11,7 @@
 
 #include "config.hh"
 
-#if HAVE_PANGO16
+#if HAVE_PANGO_FT2
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
@@ -27,7 +27,11 @@ class Pango_font : public Font_metric
   Real scale_;
   Real output_scale_;
   SCM physical_font_tab_;
-  Direction text_direction_; 
+  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 *,
@@ -36,9 +40,9 @@ public:
   ~Pango_font ();
 
   SCM font_file_name () const;
-  void register_font_file (std::string, std::string);
-  Stencil text_stencil (std::string) const;
-  Stencil pango_item_string_stencil (PangoItem const *, std::string) const;
+  void register_font_file (string, string);
+  Stencil text_stencil (string) const;
+  Stencil pango_item_string_stencil (PangoItem const *, string) const;
 
   virtual void derived_mark () const;
 };