Run `make grand-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 1a19ab3ccb6f317cb9cb3d8f83753c43bcde67df..f79e4c07bad2857d252be697c278a5764485e1f5 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -3,20 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 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 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);
+void get_glyph_index_name (char*s, FT_ULong code);
 
 class Open_type_font : public Font_metric
 {
@@ -38,22 +36,23 @@ public:
   SCM get_char_table () const;
   SCM glyph_list () const;
     
-  std::string get_otf_table (std::string tag) const;
-  static SCM make_otf (std::string);
-  virtual std::string font_name () const;
-  virtual ~Open_type_font ();
-  virtual Offset attachment_point (std::string) const;
-  virtual int count () const;
-  virtual Box get_indexed_char (int) const;
-  virtual int name_to_index (std::string) const;
-  //virtual unsigned glyph_name_to_charcode (std::string) const;
-  virtual unsigned index_to_charcode (int) const;
-  virtual void derived_mark () const;
-  virtual SCM sub_fonts () const;
-  virtual Real design_size () 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;
 };
 
-std::string get_otf_table (FT_Face face, std::string tag);
-FT_Face open_ft_face (std::string str);
+string get_otf_table (FT_Face face, string tag);
+FT_Face open_ft_face (string str);
+
 
 #endif /* OPEN_TYPE_FONT_HH */