/*
- 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--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/>.
*/
#include "open-type-font.hh"
return buffer;
}
else
- programming_error ("Cannot find OpenType table.");
+ programming_error (_f ("Free type error: %s",
+ freetype_error_string (error_code).c_str ()
+ ));
return 0;
}
}
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 ("unknown error: %d reading font file: %s", error_code,
- str.c_str ()));
+ error (_f ("error reading font file %s: %s",
+ str.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 ();
char name[len];
size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, len);
if (code)
- warning (_f ("FT_Get_Glyph_Name() returned error: %u", unsigned (code)));
+ warning (_f ("FT_Get_Glyph_Name () Freetype error: %s",
+ freetype_error_string (code)));
SCM sym = ly_symbol2scm (name);
SCM alist = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F);
char name[len];
size_t code = FT_Get_Glyph_Name (face_, i, name, len);
if (code)
- warning (_f ("FT_Get_Glyph_Name() returned error: %u", unsigned (code)));
+ warning (_f ("FT_Get_Glyph_Name () error: %s",
+ freetype_error_string (code).c_str ()));
- *tail = scm_cons (scm_makfrom0str (name), SCM_EOL);
+ *tail = scm_cons (scm_from_locale_string (name), SCM_EOL);
tail = SCM_CDRLOC (*tail);
}