X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;h=e4389b122bea6c9be5d8c2a64f5091a52b963baa;hb=c869648595a848905a7636571778385acdc772f5;hp=2e72d57af35ada1833d95f5c60807358b9ef606c;hpb=3ee551fa4f2a2c3736a06f9f85f29b9f7bd89818;p=lilypond.git

diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
index 2e72d57af3..e4389b122b 100644
--- a/lily/open-type-font.cc
+++ b/lily/open-type-font.cc
@@ -1,9 +1,20 @@
 /*
-  open-type-font.cc -- implement Open_type_font
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2007 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/>.
 */
 
 #include "open-type-font.hh"
@@ -91,25 +102,24 @@ get_otf_table (FT_Face face, string tag)
 }
 
 FT_Face
-open_ft_face (string str)
+open_ft_face (string str, FT_Long idx)
 {
   FT_Face face;
-  int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face);
+  int error_code = FT_New_Face (freetype2_library, str.c_str (), idx, &face);
 
   if (error_code == FT_Err_Unknown_File_Format)
     error (_f ("unsupported font format: %s", str.c_str ()));
   else if (error_code)
     error (_f ("error reading font file %s: %s", 
 	       str.c_str (),
-	       freetype_error_string (error_code).c_str ()
-	       ));
+	       freetype_error_string (error_code).c_str ()));
   return face;
 }
 
 SCM
 Open_type_font::make_otf (string str)
 {
-  FT_Face face = open_ft_face (str);
+  FT_Face face = open_ft_face (str, 0 /* index */);
   Open_type_font *otf = new Open_type_font (face);
 
   return otf->self_scm ();
@@ -174,7 +184,7 @@ Open_type_font::get_indexed_char (size_t signed_idx) const
       char name[len];
       size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
       if (code)
-	warning (_f ("FT_Get_Glyph_Name() Freetype error: %s",
+	warning (_f ("FT_Get_Glyph_Name () Freetype error: %s",
 		     freetype_error_string (code)));
 
       SCM sym = ly_symbol2scm (name);
@@ -299,7 +309,7 @@ Open_type_font::glyph_list () const
       char name[len];
       size_t code = FT_Get_Glyph_Name (face_, i, name, len);
       if (code)
-	warning (_f ("FT_Get_Glyph_Name() error: %s",
+	warning (_f ("FT_Get_Glyph_Name () error: %s",
 		     freetype_error_string (code).c_str ()));
 
       *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);