X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;h=730d6cef3580cef522f924b503b4ee9c51f85d55;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=49d8fd317720a6aad0ce26413de00bab7702806b;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 49d8fd3177..730d6cef35 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2014 Han-Wen Nienhuys + Copyright (C) 2004--2015 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 @@ -20,6 +20,15 @@ #include "open-type-font.hh" #include "freetype.hh" +#ifdef FT_FONT_FORMATS_H +/* FreeType 2.6+ */ +#include FT_FONT_FORMATS_H +#else +/* FreeType 2.5.5 and earlier */ +#include FT_XFREE86_H +#define FT_Get_Font_Format FT_Get_X11_Font_Format +#endif + #include using namespace std; @@ -27,7 +36,6 @@ using namespace std; #include FT_TRUETYPE_TABLES_H #include "dimensions.hh" -#include "freetype.hh" #include "international.hh" #include "modified-font-metric.hh" #include "warn.hh" @@ -77,7 +85,11 @@ load_scheme_table (char const *tag_str, FT_Face face) string contents ((char const *)buffer, length); contents = "(quote (" + contents + "))"; +#if GUILEV2 + tab = scm_eval_string (scm_from_utf8_string (contents.c_str ())); +#else tab = scm_c_eval_string (contents.c_str ()); +#endif free (buffer); } return tab; @@ -117,6 +129,119 @@ open_ft_face (const string &str, FT_Long idx) return face; } +string +get_postscript_name (FT_Face face) +{ + string face_ps_name; + const char *psname = FT_Get_Postscript_Name (face); + if (psname) + face_ps_name = psname; + else + { + warning (_ ("cannot get postscript name")); + return ""; + } + + const char *fmt = FT_Get_Font_Format (face); + if (fmt) + { + if (static_cast(fmt) != "CFF") + return face_ps_name; // For non-CFF font, pass it through. + } + else + { + warning (_f ("cannot get font %s format", face_ps_name.c_str ())); + return face_ps_name; + } + + // For OTF and OTC fonts, we use data from the font's 'CFF' table only + // because other tables are not embedded in the output PS file. + string cff_table = get_otf_table (face, "CFF "); + + FT_Open_Args args; + args.flags = FT_OPEN_MEMORY; + args.memory_base = static_cast + (static_cast(cff_table.data ())); + args.memory_size = cff_table.size (); + + FT_Face cff_face; + // According to OpenType Specification ver 1.7, + // the CFF (derived from OTF and OTC) has only one name. + // So we use zero as the font index. + FT_Error error_code = FT_Open_Face (freetype2_library, &args, + 0 /* font index */, + &cff_face); + if (error_code) + { + warning (_f ("cannot read CFF %s: %s", + face_ps_name, + freetype_error_string (error_code).c_str ())); + return face_ps_name; + } + + string ret; + const char *cffname = FT_Get_Postscript_Name (cff_face); + if (cffname) + ret = cffname; + else + { + // FreeType 2.6 and 2.6.1 cannot get PS name from pure-CFF. + // (FreeType 2.5.5 and earlier does not have this issue. + // FreeType 2.6.2+ has this bug fixed.) + // So we need direct parsing of the 'CFF' table, in this case. + + debug_output (_f ("Directly parsing 'CFF' table of font %s.", + face_ps_name.c_str ())); + + // See Adobe technote '5176.CFF.pdf', sections 2 and 5-7. + size_t hdrsize = static_cast(cff_table.at(2)); + string::iterator it = cff_table.begin () + hdrsize; + + unsigned int name_index_count; + name_index_count = static_cast(*it++) << 8; + name_index_count |= static_cast(*it++); + + size_t offsize = static_cast(*it++); + + if (name_index_count && 1 <= offsize && offsize <= 4) + { + // We get the first name in the CFF's name index + // because this CFF (derived from OTF and OTC) + // has only one name. + size_t off1 = 0, off2 = 0; + for (size_t t = 0; t < offsize; t++) + off1 = ( off1 << 8 ) | static_cast(*it++); + if (off1) + { + for (size_t t = 0; t < offsize; t++) + off2 = ( off2 << 8 ) | static_cast(*it++); + } + if (off1 && off1 < off2) + { + ret.assign (&cff_table.at(hdrsize + 3 + + offsize * (name_index_count + 1) + + off1 - 1), + &cff_table.at(hdrsize + 3 + + offsize * (name_index_count + 1) + + off2 - 1)); + } + } + + if (ret.empty ()) + { + warning (_f ("cannot get font %s CFF name", face_ps_name.c_str ())); + ret = face_ps_name; + } + } + + debug_output (_f ("Replace font name from %s to %s.", + face_ps_name.c_str (), ret.c_str ())); + + FT_Done_Face (cff_face); + + return ret; +} + SCM Open_type_font::make_otf (const string &str) { @@ -126,13 +251,17 @@ Open_type_font::make_otf (const string &str) return otf->self_scm (); } -Open_type_font::Open_type_font (FT_Face face) +Preinit_Open_type_font::Preinit_Open_type_font () { - face_ = face; lily_character_table_ = SCM_EOL; lily_global_table_ = SCM_EOL; lily_subfonts_ = SCM_EOL; lily_index_to_bbox_table_ = SCM_EOL; +} + +Open_type_font::Open_type_font (FT_Face face) +{ + face_ = face; lily_character_table_ = alist_to_hashq (load_scheme_table ("LILC", face_)); lily_global_table_ = alist_to_hashq (load_scheme_table ("LILY", face_)); @@ -140,6 +269,8 @@ Open_type_font::Open_type_font (FT_Face face) index_to_charcode_map_ = make_index_to_charcode_map (face_); lily_index_to_bbox_table_ = scm_c_make_hash_table (257); + + postscript_name_ = get_postscript_name (face_); } void @@ -158,7 +289,7 @@ Open_type_font::attachment_point (const string &glyph_name) const SCM entry = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F); Offset o; - if (entry == SCM_BOOL_F) + if (scm_is_false (entry)) return o; SCM char_alist = entry; @@ -174,7 +305,7 @@ Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const { SCM box = scm_hashq_ref (lily_index_to_bbox_table_, scm_from_unsigned_integer (signed_idx), SCM_BOOL_F); - Box *box_ptr = Box::unsmob (box); + Box *box_ptr = unsmob (box); if (box_ptr) return *box_ptr; } @@ -192,7 +323,7 @@ Open_type_font::get_indexed_char_dimensions (size_t signed_idx) const SCM sym = ly_symbol2scm (name); SCM alist = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F); - if (alist != SCM_BOOL_F) + if (scm_is_true (alist)) { SCM bbox = scm_cdr (scm_assq (ly_symbol2scm ("bbox"), alist)); @@ -319,7 +450,7 @@ Open_type_font::get_global_table () const string Open_type_font::font_name () const { - return FT_Get_Postscript_Name (face_); + return postscript_name_; } SCM @@ -337,7 +468,7 @@ Open_type_font::glyph_list () const warning (_f ("FT_Get_Glyph_Name () error: %s", freetype_error_string (code).c_str ())); - *tail = scm_cons (scm_from_locale_string (name), SCM_EOL); + *tail = scm_cons (scm_from_ascii_string (name), SCM_EOL); tail = SCM_CDRLOC (*tail); }