X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fopen-type-font.hh;h=be1f85bf7accd9f04d06c47d2912beed86e2e191;hb=56f77a28d7c1d9723899f90889016ce4978d890c;hp=02278dbf2337cdebbc739d277a8f7d13b697393f;hpb=df2bf3ee4c32d569f346d84fb5b42cab676a74d1;p=lilypond.git

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index 02278dbf23..be1f85bf7a 100644
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -3,18 +3,21 @@
 
   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);
+void get_unicode_name (char*s, FT_ULong code);
 
 class Open_type_font : public Font_metric
 {
@@ -24,30 +27,34 @@ 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 ();
-  virtual Offset attachment_point (String) const;
-  virtual int count () const;
-  virtual Box get_indexed_char (int) const;
-  virtual int name_to_index (String) const;
-  //virtual unsigned glyph_name_to_charcode (String) const;
-  virtual unsigned index_to_charcode (int) const;
-  virtual void derived_mark () const;
-  virtual SCM sub_fonts () const;
-  virtual Real design_size () const;
+  SCM glyph_list () const;
+    
+  string get_otf_table (string tag) const;
+  static SCM make_otf (string);
+  string font_name () const;
+  ~Open_type_font ();
+  Offset attachment_point (string) const;
+  size_t count () const;
+  Box get_indexed_char (size_t) const;
+  size_t name_to_index (string) const;
+  //size_t glyph_name_to_charcode (string) const;
+  size_t index_to_charcode (size_t) const;
+  void derived_mark () const;
+  SCM sub_fonts () const;
+  Real design_size () const;
 };
 
-String get_otf_table (FT_Face face, String tag);
-FT_Face open_ft_face (String str);
+string get_otf_table (FT_Face face, string tag);
+FT_Face open_ft_face (string str);
 
 #endif /* OPEN_TYPE_FONT_HH */