*** empty log message ***

[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 e50166ad73445d612259d9336f8b6e01be71be36..1a19ab3ccb6f317cb9cb3d8f83753c43bcde67df 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -3,34 +3,57 @@
 
   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 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);
+
 class Open_type_font : public Font_metric
 {
-  FT_Face face_; /* handle to face object */ 
-public:
-  static SCM make_otf (String);
-  virtual ~Open_type_font();
-  virtual Box get_indexed_char (int) const;
-  virtual int name_to_index (String) const;
+  /* handle to face object */
+  FT_Face face_;
 
-#if 0
+  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;
+  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 int index_to_ascii (int) const;
-  virtual Box get_ascii_char (int) const;
-  virtual Offset get_indexed_wxwy (int) const;
-#endif
+  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;
 };
 
+std::string get_otf_table (FT_Face face, std::string tag);
+FT_Face open_ft_face (std::string str);
 
 #endif /* OPEN_TYPE_FONT_HH */
-