X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=7d50025c388197c9629e84a48fa55d3ecaea791c;hb=57a2a2ef1c3a62ce1897c827c0fee6223d193e2e;hp=73ea7426a65ea4a6bf498d1c9881a4bd138ae7ec;hpb=1169afceeedabefc1b7cd8cd5c08ca721c2e6988;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 73ea7426a6..7d50025c38 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -8,6 +8,7 @@ #define PANGO_ENABLE_BACKEND // ugh, why necessary? #include +#include /* Ugh. */ #include "pango-font.hh" @@ -76,16 +77,26 @@ Pango_font::derived_mark () const } +map filename_charcode_maps_map; +Index_to_charcode_map const *get_index_to_charcode_map (string postscript_name, FT_Face face); + + Index_to_charcode_map const * -Pango_font::get_index_to_charcode_map (string key, FT_Face face) +get_index_to_charcode_map (string filename, FT_Face face) { - if (charcode_maps_.find (key) == charcode_maps_.end ()) - charcode_maps_[key] = make_index_to_charcode_map (face); + if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ()) + filename_charcode_maps_map[filename] = make_index_to_charcode_map (face); - if (charcode_maps_.find (key) == charcode_maps_.end ()) + if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ()) return 0; - return &charcode_maps_[key]; + return &filename_charcode_maps_map[filename]; +} + +void +get_glyph_index_name (char *s, FT_ULong code) +{ + sprintf (s, "glyphIndex%lX", code); } void @@ -99,7 +110,8 @@ get_unicode_name (char*s, FT_ULong code) Stencil -Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const +Pango_font::pango_item_string_stencil (PangoItem const *item, string str, + bool tight_bbox) const { const int GLYPH_NAME_LEN = 256; char glyph_name[GLYPH_NAME_LEN]; @@ -118,22 +130,28 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const PangoFcFont); FT_Face ftface = pango_fc_font_lock_face (fcfont); - Box b (Interval (PANGO_LBEARING (ink_rect), - PANGO_RBEARING (ink_rect)), - Interval (-PANGO_DESCENT (ink_rect), - PANGO_ASCENT (ink_rect))); + + PangoRectangle const *which_rect + = (tight_bbox) + ? &ink_rect + : &logical_rect; + + Box b (Interval (PANGO_LBEARING (logical_rect), + PANGO_RBEARING (logical_rect)), + Interval (-PANGO_DESCENT (*which_rect), + PANGO_ASCENT (*which_rect))); b.scale (scale_); char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); FcPattern *fcpat = fcfont->font_pattern; - char *file_name_as_ptr = 0; - FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name_as_ptr); + FcChar8 *file_name_as_ptr = 0; + FcPatternGetString (fcpat, FC_FILE, 0, &file_name_as_ptr); string file_name; if (file_name_as_ptr) { /* Normalize file name. */ - file_name = File_name (file_name_as_ptr).to_string (); + file_name = File_name ((char const *)file_name_as_ptr).to_string (); } SCM glyph_exprs = SCM_EOL; @@ -142,8 +160,9 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const Index_to_charcode_map const *cmap = 0; bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES; if (! has_glyph_names) - cmap = ((Pango_font*)this)->get_index_to_charcode_map (file_name, ftface); - + cmap = get_index_to_charcode_map (file_name, ftface); + + bool is_ttf = string (FT_Get_X11_Font_Format (ftface)) == "TrueType"; bool cid_keyed = false; for (int i = 0; i < pgs->num_glyphs; i++) { @@ -165,8 +184,8 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const && cmap /* Ugh should ask FreeType about font type. */ - && (file_name.find (".ttf") != NPOS - || file_name.find (".TTF") != NPOS)) + && is_ttf + && cmap->find (pg) != cmap->end ()) { FT_ULong char_code = cmap->find (pg)->second; get_unicode_name (glyph_name, char_code); @@ -174,10 +193,19 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const if (glyph_name[0] == '\0' && has_glyph_names) { - programming_error ("Glyph has no name, but font supports glyph naming. Skipping glyph."); + programming_error (_f ("Glyph has no name, but font supports glyph naming.\n" + "Skipping glyph U+%0X, file %s", + pg, + file_name.c_str ())); continue; } - + + if (glyph_name[0] == '\0' && is_ttf) + { + // access by glyph index directly. + get_glyph_index_name (glyph_name, pg); + } + if (glyph_name[0] == '\0') { /* @@ -262,8 +290,21 @@ Pango_font::physical_font_tab () const return physical_font_tab_; } + +Stencil +Pango_font::word_stencil (string str) const +{ + return text_stencil (str, true); +} + Stencil Pango_font::text_stencil (string str) const +{ + return text_stencil (str, false); +} + +Stencil +Pango_font::text_stencil (string str, bool tight) const { GList *items = pango_itemize (context_, @@ -287,7 +328,7 @@ Pango_font::text_stencil (string str) const { PangoItem *item = (PangoItem *) ptr->data; - Stencil item_stencil = pango_item_string_stencil (item, str); + Stencil item_stencil = pango_item_string_stencil (item, str, tight); if (text_dir == RIGHT) { @@ -323,14 +364,11 @@ Pango_font::text_stencil (string str) const /* For Pango based backends, we take a shortcut. */ - char *descr_string = pango_font_description_to_string (pango_description_); SCM exp = scm_list_3 (ly_symbol2scm ("utf-8-string"), - scm_makfrom0str (descr_string), + scm_makfrom0str (description_string ().c_str ()), scm_makfrom0str (str.c_str ())); - g_free (descr_string); - Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ()); return Stencil (b, exp); @@ -340,6 +378,16 @@ Pango_font::text_stencil (string str) const return dest; } +string +Pango_font::description_string () const +{ + char *descr_string = pango_font_description_to_string (pango_description_); + string s (descr_string); + g_free (descr_string); + return s; +} + + SCM Pango_font::font_file_name () const {