* The grand 2005-2006 replace.

[lilypond.git] / lily / include / open-type-font.hh

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index b58f6dcf895f45dd6ea8b1c9213f2f9433a13e7f..03cf0daaf2a3c2e49952c3444909c6169a527657 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -3,17 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef OPEN_TYPE_FONT_HH
 #define OPEN_TYPE_FONT_HH
 
 #include <map>
+using namespace std;
+
 #include "freetype.hh"
 #include "font-metric.hh"
 
-typedef std::map < FT_UInt, FT_ULong> Index_to_charcode_map;
+typedef map<FT_UInt, FT_ULong> Index_to_charcode_map;
 Index_to_charcode_map make_index_to_charcode_map (FT_Face face);
 
 class Open_type_font : public Font_metric
@@ -24,14 +26,18 @@ class Open_type_font : public Font_metric
   SCM lily_subfonts_;
   SCM lily_character_table_;
   SCM lily_global_table_;
+  SCM lily_index_to_bbox_table_;
+
   Index_to_charcode_map index_to_charcode_map_;
   Open_type_font (FT_Face);
 
+  DECLARE_CLASSNAME(Open_type_font);
 public:
   SCM get_subfonts () const;
   SCM get_global_table () const;
   SCM get_char_table () const;
 
+  String get_otf_table (String tag) const;
   static SCM make_otf (String);
   virtual String font_name () const;
   virtual ~Open_type_font ();
@@ -43,13 +49,10 @@ public:
   virtual unsigned index_to_charcode (int) const;
   virtual void derived_mark () const;
   virtual SCM sub_fonts () const;
-#if 0
-  virtual int count () const;
-  virtual int index_to_ascii (int) const;
-  virtual Box get_ascii_char (int) const;
-  virtual Offset get_indexed_wxwy (int) const;
-#endif
   virtual Real design_size () const;
 };
 
+String get_otf_table (FT_Face face, String tag);
+FT_Face open_ft_face (String str);
+
 #endif /* OPEN_TYPE_FONT_HH */