resolve merge

[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 475cc4c169e40a4b79234fec3858303d1bd0aa5d..486606fd95cd2d138e99fc4b3bdc570b21383f45 100644 (file)
--- a/lily/include/open-type-font.hh
+++ b/lily/include/open-type-font.hh
@@ -1,9 +1,20 @@
 /*
-  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--2009 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
@@ -42,7 +53,7 @@ public:
   ~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;