X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fopen-type-font.hh;h=785add735a839b608937efe2104f9255a66f2874;hb=3345456ec7a84db2deb50f3f9f825b4f18870d7b;hp=f79e4c07bad2857d252be697c278a5764485e1f5;hpb=0387f04497978e37b335a8b99eec905499d6ad0f;p=lilypond.git

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index f79e4c07ba..785add735a 100644
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -1,20 +1,30 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2008 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 "font-metric.hh"
 
 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);
+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
 {
@@ -29,20 +39,20 @@ class Open_type_font : public Font_metric
   Index_to_charcode_map index_to_charcode_map_;
   Open_type_font (FT_Face);
 
-  DECLARE_CLASSNAME(Open_type_font);
+  DECLARE_CLASSNAME (Open_type_font);
 public:
   SCM get_subfonts () const;
   SCM get_global_table () const;
   SCM get_char_table () 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;
+  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;
@@ -52,7 +62,6 @@ public:
 };
 
 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 */