X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fopen-type-font.cc;h=97c49feca2880936f5c173c1b685f3ad3491db2f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3b209c0a2c104e61f4429cd437f733f697a06850;hpb=b5e1d63092238f020afab1378596c1ba5b7a3b83;p=lilypond.git diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 3b209c0a2c..97c49feca2 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -1,48 +1,57 @@ /* - open-type-font.cc -- implement Open_type_font + open-type-font.cc -- implement Open_type_font source file of the GNU LilyPond music typesetter - (c) 2004 Han-Wen Nienhuys - + (c) 2004--2008 Han-Wen Nienhuys */ -#include -#include +#include "open-type-font.hh" + +#include + +using namespace std; #include -#include "warn.hh" -#include "open-type-font.hh" #include "dimensions.hh" +#include "international.hh" #include "modified-font-metric.hh" - -const Real point_constant = 1 PT; +#include "warn.hh" FT_Byte * load_table (char const *tag_str, FT_Face face, FT_ULong *length) { - FT_ULong tag = FT_MAKE_TAG(tag_str[0], tag_str[1], tag_str[2], tag_str[3]); + *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); if (!error_code) { - FT_Byte *buffer = (FT_Byte*) malloc (*length); + FT_Byte *buffer = (FT_Byte *) malloc (*length); if (buffer == NULL) - error (_f ("Cannot allocate %d bytes", *length)); + error (_f ("cannot allocate %lu bytes", *length)); - error_code = FT_Load_Sfnt_Table (face, tag, 0, buffer, length ); + error_code = FT_Load_Sfnt_Table (face, tag, 0, buffer, length); if (error_code) - { - error (_f ("Could not load %s font table", tag_str)); - } + error (_f ("cannot load font table: %s", tag_str)); return buffer; } + else + programming_error (_f ("Free type error: %s", + freetype_error_string (error_code).c_str () + )); return 0; } +string +Open_type_font::get_otf_table (string tag) const +{ + return ::get_otf_table (face_, tag); +} + SCM load_scheme_table (char const *tag_str, FT_Face face) { @@ -52,50 +61,55 @@ load_scheme_table (char const *tag_str, FT_Face face) SCM tab = SCM_EOL; if (buffer) { - String contents ((Byte const*)buffer, length); - contents = "(quote (" + contents + "))"; + string contents ((char const*)buffer, length); + contents = "(quote (" + contents + "))"; - tab = scm_c_eval_string (contents.to_str0 ()); + tab = scm_c_eval_string (contents.c_str ()); free (buffer); } return tab; } -Index_to_charcode_map -make_index_to_charcode_map (FT_Face face) +Open_type_font::~Open_type_font () { - Index_to_charcode_map m; - FT_ULong charcode; - FT_UInt gindex; - - for (charcode = FT_Get_First_Char (face, &gindex); gindex != 0; - charcode = FT_Get_Next_Char (face, charcode, &gindex)) - m[gindex] = charcode; - return m; + FT_Done_Face (face_); } -Open_type_font::~Open_type_font() +/* + UGH fix naming +*/ +string +get_otf_table (FT_Face face, string tag) { - FT_Done_Face (face_); + FT_ULong len; + FT_Byte *tab = load_table (tag.c_str (), face, &len); + string ret ((char const*) tab, len); + free (tab); + + return ret; } -SCM -Open_type_font::make_otf (String str) +FT_Face +open_ft_face (string str) { FT_Face face; - int error_code = FT_New_Face(freetype2_library, str.to_str0 (), 0, &face); + int error_code = FT_New_Face (freetype2_library, str.c_str (), 0, &face); if (error_code == FT_Err_Unknown_File_Format) - { - error (_f ("Unsupported font format: %s", str.to_str0 ())); - } + 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.to_str0 ())); - } + 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); Open_type_font *otf = new Open_type_font (face); return otf->self_scm (); @@ -107,11 +121,14 @@ Open_type_font::Open_type_font (FT_Face face) lily_character_table_ = SCM_EOL; lily_global_table_ = SCM_EOL; lily_subfonts_ = SCM_EOL; - + lily_index_to_bbox_table_ = SCM_EOL; + lily_character_table_ = alist_to_hashq (load_scheme_table ("LILC", face_)); lily_global_table_ = alist_to_hashq (load_scheme_table ("LILY", face_)); lily_subfonts_ = load_scheme_table ("LILF", face_); index_to_charcode_map_ = make_index_to_charcode_map (face_); + + lily_index_to_bbox_table_ = scm_c_make_hash_table (257); } void @@ -120,12 +137,13 @@ Open_type_font::derived_mark () const scm_gc_mark (lily_character_table_); scm_gc_mark (lily_global_table_); scm_gc_mark (lily_subfonts_); + scm_gc_mark (lily_index_to_bbox_table_); } Offset -Open_type_font::attachment_point (String glyph_name) const +Open_type_font::attachment_point (string glyph_name) const { - SCM sym = ly_symbol2scm (glyph_name.to_str0 ()); + SCM sym = ly_symbol2scm (glyph_name.c_str ()); SCM entry = scm_hashq_ref (lily_character_table_, sym, SCM_BOOL_F); Offset o; @@ -134,28 +152,38 @@ Open_type_font::attachment_point (String glyph_name) const SCM char_alist = entry; SCM att_scm = scm_cdr (scm_assq (ly_symbol2scm ("attachment"), char_alist)); - + return point_constant * ly_scm2offset (att_scm); } Box -Open_type_font::get_indexed_char (int signed_idx) const +Open_type_font::get_indexed_char (size_t signed_idx) const { + if (SCM_HASHTABLE_P (lily_index_to_bbox_table_)) + { + SCM box = scm_hashq_ref (lily_index_to_bbox_table_, + scm_from_unsigned (signed_idx), SCM_BOOL_F); + Box *box_ptr = Box::unsmob (box); + if (box_ptr) + return *box_ptr; + } + if (SCM_HASHTABLE_P (lily_character_table_)) { - const int len =256; + const size_t len = 256; char name[len]; - int code = FT_Get_Glyph_Name (face_, signed_idx, name, len); + size_t code = FT_Get_Glyph_Name (face_, signed_idx, name, 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); - + if (alist != SCM_BOOL_F) { SCM bbox = scm_cdr (scm_assq (ly_symbol2scm ("bbox"), alist)); - + Box b; b[X_AXIS][LEFT] = scm_to_double (scm_car (bbox)); bbox = scm_cdr (bbox); @@ -167,10 +195,14 @@ Open_type_font::get_indexed_char (int signed_idx) const bbox = scm_cdr (bbox); b.scale (point_constant); + + scm_hashq_set_x (lily_index_to_bbox_table_, + scm_from_unsigned (signed_idx), + b.smobbed_copy ()); return b; } } - + FT_UInt idx = signed_idx; FT_Load_Glyph (face_, idx, @@ -182,29 +214,30 @@ Open_type_font::get_indexed_char (int signed_idx) const Box b (Interval (-hb, m.width - hb), Interval (-vb, m.height - vb)); - b.scale (design_size () * Real (point_constant) / face_->units_per_EM); + b.scale (design_size () / Real (face_->units_per_EM)); return b; } -int -Open_type_font::name_to_index (String nm) const +size_t +Open_type_font::name_to_index (string nm) const { - char *nm_str = (char*) nm.to_str0 (); - if (int idx = FT_Get_Name_Index (face_, nm_str)) + char *nm_str = (char *) nm.c_str (); + if (size_t idx = FT_Get_Name_Index (face_, nm_str)) return idx; - return -1; + + return (size_t) -1; } -unsigned -Open_type_font::index_to_charcode (int i) const +size_t +Open_type_font::index_to_charcode (size_t i) const { - return ((Open_type_font*) this)->index_to_charcode_map_[i]; + return ((Open_type_font *) this)->index_to_charcode_map_[i]; } -int +size_t Open_type_font::count () const { - return ((Open_type_font*) this)->index_to_charcode_map_.size (); + return ((Open_type_font *) this)->index_to_charcode_map_.size (); } Real @@ -218,44 +251,17 @@ Open_type_font::design_size () const non-design-size fonts. I vote for 1 - which will trip errors more quickly. --hwn. - */ - scm_from_int (1)); - return scm_to_double (entry); + */ + scm_from_unsigned (1)); + return scm_to_double (entry) * Real (point_constant); } - SCM Open_type_font::sub_fonts () const { return lily_subfonts_; } -LY_DEFINE (ly_font_sub_fonts, "ly:font-sub-fonts", 1, 0, 0, - (SCM font), - "Given the font metric @var{font} of an OpenType font, return the " - "names of the subfonts within @var{font}.") -{ - Font_metric *fm = unsmob_metrics (font); - SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "font-metric"); - return fm->sub_fonts (); -} - -LY_DEFINE (ly_otf_font_glyph_info, "ly:otf-font-glyph-info", 2, 0, 0, - (SCM font, SCM glyph), - "Given the font metric @var{font} of an OpenType font, return the " - "information about named glyph @var{glyph} (a string)") -{ - Modified_font_metric * fm - = dynamic_cast (unsmob_metrics (font)); - Open_type_font * otf = dynamic_cast (fm->original_font ()); - SCM_ASSERT_TYPE (otf, font, SCM_ARG1, __FUNCTION__, "OTF font-metric"); - SCM_ASSERT_TYPE (scm_is_string (glyph), glyph, SCM_ARG1, - __FUNCTION__, "string"); - - SCM sym = scm_string_to_symbol (glyph); - return scm_hashq_ref (otf->get_char_table (), sym, SCM_EOL); -} - SCM Open_type_font::get_char_table () const { @@ -273,3 +279,32 @@ Open_type_font::get_global_table () const { return lily_global_table_; } + +string +Open_type_font::font_name () const +{ + return FT_Get_Postscript_Name (face_); +} + + +SCM +Open_type_font::glyph_list () const +{ + SCM retval = SCM_EOL; + SCM *tail = &retval; + + for (int i = 0; i < face_->num_glyphs; i++) + { + const size_t len = 256; + char name[len]; + size_t code = FT_Get_Glyph_Name (face_, i, name, len); + if (code) + 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_CDRLOC (*tail); + } + + return retval; +}