(parse_symbol_list): Bugfix.

[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 5d041d307b79f3cd0d224c7effbab93785d6b76b..05d6f54d3387f00284079c3cc75eb3dfe0a55d93 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef OPEN_TYPE_FONT_HH
@@ -15,32 +14,42 @@
 #include "font-metric.hh"
 
 typedef std::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 */
+  /* handle to face object */
+  FT_Face face_;
 
-  SCM lily_character_table_; 
+  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);
+
 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 ~Open_type_font();
+  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;
-#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 SCM sub_fonts () const;
   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 */
-