X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;h=6be9dc41f83a29a2b2dfc0d951404bbded164444;hb=02ecfc59e4e77633139ba19d9cf45701d17fac40;hp=1a61c07884869fbe0ffd98ae1ad786cf1b06ee34;hpb=72bd1ea165831738260e671737d84dbaffe6a6fc;p=lilypond.git diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 1a61c07884..6be9dc41f8 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--2010 Han-Wen Nienhuys - (c) 2004--2006 Han-Wen Nienhuys + 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 . */ #include "open-type-font.hh" @@ -25,21 +36,23 @@ load_table (char const *tag_str, FT_Face face, FT_ULong *length) *length = 0; FT_ULong tag = FT_MAKE_TAG (tag_str[0], tag_str[1], tag_str[2], tag_str[3]); - int error_code = FT_Load_Sfnt_Table (face, tag, 0, NULL, length); + FT_Error error_code = FT_Load_Sfnt_Table (face, tag, 0, NULL, length); if (!error_code) { FT_Byte *buffer = (FT_Byte *) malloc (*length); if (buffer == NULL) - error (_f ("can't allocate %lu bytes", *length)); + error (_f ("cannot allocate %lu bytes", *length)); error_code = FT_Load_Sfnt_Table (face, tag, 0, buffer, length); if (error_code) - error (_f ("can't load font table: %s", tag_str)); + error (_f ("cannot load font table: %s", tag_str)); 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; } @@ -82,28 +95,31 @@ get_otf_table (FT_Face face, string tag) { FT_ULong len; FT_Byte *tab = load_table (tag.c_str (), face, &len); + string ret ((char const*) tab, len); + free (tab); - return string ((char const*) tab, len); + return ret; } 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); + FT_Error 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 (); @@ -151,7 +167,7 @@ Open_type_font::attachment_point (string glyph_name) const } Box -Open_type_font::get_indexed_char (size_t signed_idx) const +Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const { if (SCM_HASHTABLE_P (lily_index_to_bbox_table_)) { @@ -166,9 +182,11 @@ Open_type_font::get_indexed_char (size_t signed_idx) const { const size_t len = 256; char name[len]; - size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, len); + FT_Error code = FT_Get_Glyph_Name (face_, FT_UInt (signed_idx), + name, FT_UInt (len)); if (code) - warning (_f ("FT_Get_Glyph_Name() returned error: %d", 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); @@ -196,16 +214,14 @@ Open_type_font::get_indexed_char (size_t signed_idx) const } } - FT_UInt idx = signed_idx; - FT_Load_Glyph (face_, - idx, - FT_LOAD_NO_SCALE); + FT_UInt idx = FT_UInt (signed_idx); + FT_Load_Glyph (face_, idx, FT_LOAD_NO_SCALE); FT_Glyph_Metrics m = face_->glyph->metrics; - int hb = m.horiBearingX; - int vb = m.horiBearingY; - Box b (Interval (-hb, m.width - hb), - Interval (-vb, m.height - vb)); + FT_Pos hb = m.horiBearingX; + FT_Pos vb = m.horiBearingY; + Box b (Interval (Real (-hb), Real (m.width - hb)), + Interval (Real (-vb), Real (m.height - vb))); b.scale (design_size () / Real (face_->units_per_EM)); return b; @@ -215,8 +231,8 @@ size_t Open_type_font::name_to_index (string nm) const { char *nm_str = (char *) nm.c_str (); - if (size_t idx = FT_Get_Name_Index (face_, nm_str)) - return idx; + if (FT_UInt idx = FT_Get_Name_Index (face_, nm_str)) + return (size_t) idx; return (size_t) -1; } @@ -224,13 +240,22 @@ Open_type_font::name_to_index (string nm) const size_t Open_type_font::index_to_charcode (size_t i) const { - return ((Open_type_font *) this)->index_to_charcode_map_[i]; + map::const_iterator iter; + iter = index_to_charcode_map_.find (FT_UInt (i)); + + if (iter != index_to_charcode_map_.end ()) + return (size_t) iter->second; + else + { + programming_error (_ ("Invalid index for character")); + return 0; + } } size_t Open_type_font::count () const { - return ((Open_type_font *) this)->index_to_charcode_map_.size (); + return index_to_charcode_map_.size (); } Real @@ -279,7 +304,6 @@ Open_type_font::font_name () const return FT_Get_Postscript_Name (face_); } - SCM Open_type_font::glyph_list () const { @@ -290,11 +314,12 @@ Open_type_font::glyph_list () const { const size_t len = 256; char name[len]; - size_t code = FT_Get_Glyph_Name (face_, i, name, len); + FT_Error code = FT_Get_Glyph_Name (face_, i, name, len); if (code) - warning (_f ("FT_Get_Glyph_Name() returned error: %d", 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); }