Rename Font_metric::get_indexed_char() to

[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 e1d798611bb6d84c36ff48703074a782c28d9ea4..6f20ffb5fb29fc032bf4ac9cf05e2c8558518d8e 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -1,22 +1,31 @@
 /*
-  open-type-font.hh -- declare Open_type_font
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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
 {
@@ -43,17 +52,18 @@ public:
   string font_name () const;
   ~Open_type_font ();
   Offset attachment_point (string) const;
-  vsize count () const;
-  Box get_indexed_char (vsize) const;
-  vsize name_to_index (string) const;
-  //vsize glyph_name_to_charcode (string) const;
-  vsize index_to_charcode (vsize) const;
+  size_t count () const;
+  Box get_indexed_char_dimensions (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);
+FT_Face open_ft_face (string str, FT_Long idx);
+
 
 #endif /* OPEN_TYPE_FONT_HH */