X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=d02b63ae7a01ac0a63358f637616d4733af0f4a6;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=aa2c7f35c40410964a24a02bbadb642b6fbd8ded;hpb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index aa2c7f35c4..d02b63ae7a 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2008 Han-Wen Nienhuys + (c) 2004--2009 Han-Wen Nienhuys */ #define PANGO_ENABLE_BACKEND // ugh, why necessary? @@ -11,8 +11,9 @@ #include #include +#include -/* Ugh. */ +// Ugh. #include "pango-font.hh" #include "dimensions.hh" @@ -28,32 +29,27 @@ #if HAVE_PANGO_FT2 #include "stencil.hh" -Pango_font::Pango_font (PangoFT2FontMap *fontmap, +Pango_font::Pango_font (PangoFT2FontMap * /* fontmap */, PangoFontDescription const *description, Real output_scale) { - (void) fontmap; - physical_font_tab_ = scm_c_make_hash_table (11); PangoDirection pango_dir = PANGO_DIRECTION_LTR; - context_ - = pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION); + context_ = pango_ft2_get_context (PANGO_RESOLUTION, + PANGO_RESOLUTION); pango_description_ = pango_font_description_copy (description); attribute_list_ = pango_attr_list_new (); - /* - urgh. I don't understand this. Why isn't this 1/(scale * - resolution * output_scale) - - --hwn - */ + // urgh. I don't understand this. Why isn't this 1/(scale * + // resolution * output_scale) + // + // --hwn output_scale_ = output_scale; - scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); + scale_ = INCH_TO_BP + / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); - /* - ugh. Should make this configurable. - */ + // ugh. Should make this configurable. pango_context_set_language (context_, pango_language_from_string ("en_US")); pango_context_set_base_dir (context_, pango_dir); pango_context_set_font_description (context_, description); @@ -67,11 +63,14 @@ Pango_font::~Pango_font () } void -Pango_font::register_font_file (string filename, string ps_name) +Pango_font::register_font_file (string filename, + string ps_name, + int face_index) { scm_hash_set_x (physical_font_tab_, ly_string2scm (ps_name), - ly_string2scm (filename)); + scm_list_2 (ly_string2scm (filename), + scm_from_int (face_index))); } void @@ -80,32 +79,33 @@ Pango_font::derived_mark () const scm_gc_mark (physical_font_tab_); } - void -get_glyph_index_name (char *s, FT_ULong code) +get_glyph_index_name (char *s, + FT_ULong code) { sprintf (s, "glyphIndex%lX", code); } void -get_unicode_name (char*s, FT_ULong code) +get_unicode_name (char *s, + FT_ULong code) { if (code > 0xFFFF) - sprintf (s, "u%lX", code); + sprintf (s, "u%lX", code); else - sprintf (s, "uni%04lX", code); + sprintf (s, "uni%04lX", code); } - Stencil -Pango_font::pango_item_string_stencil (PangoItem const *item, string str, +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]; PangoAnalysis const *pa = &(item->analysis); PangoGlyphString *pgs = pango_glyph_string_new (); - + pango_shape (str.c_str () + item->offset, item->length, (PangoAnalysis*) pa, pgs); @@ -119,39 +119,44 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, FT_Face ftface = pango_fc_font_lock_face (fcfont); - PangoRectangle const *which_rect - = (tight_bbox) - ? &ink_rect - : &logical_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; + FcChar8 *file_name_as_ptr = 0; FcPatternGetString (fcpat, FC_FILE, 0, &file_name_as_ptr); + // due to a bug in FreeType 2.3.7 and earlier we can't use + // ftface->face_index; it is always zero for some font formats, + // in particular TTCs which we are interested in + int face_index = 0; + FcPatternGetInteger (fcpat, FC_INDEX, 0, &face_index); + string file_name; if (file_name_as_ptr) - { - /* Normalize file name. */ - file_name = File_name ((char const *)file_name_as_ptr).to_string (); - } - + // Normalize file name. + file_name = File_name ((char const *)file_name_as_ptr).to_string (); + SCM glyph_exprs = SCM_EOL; SCM *tail = &glyph_exprs; - + Index_to_charcode_map const *cmap = 0; bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES; - if (! has_glyph_names) - cmap = all_fonts_global->get_index_to_charcode_map (file_name, ftface); + if (!has_glyph_names) + cmap = all_fonts_global->get_index_to_charcode_map ( + file_name, face_index, 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++) { PangoGlyphInfo *pgi = pgs->glyphs + i; @@ -162,11 +167,12 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, glyph_name[0] = '\0'; if (has_glyph_names) { - int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); + int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, + GLYPH_NAME_LEN); if (errorcode) - programming_error (_f ("FT_Get_Glyph_Name () error: %s", - freetype_error_string (errorcode).c_str () - )); + programming_error ( + _f ("FT_Get_Glyph_Name () error: %s", + freetype_error_string (errorcode).c_str ())); } SCM char_id = SCM_EOL; @@ -179,51 +185,44 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, get_unicode_name (glyph_name, char_code); } - if (glyph_name[0] == '\0' && has_glyph_names) + if (glyph_name[0] == '\0' && has_glyph_names) { - programming_error (_f ("Glyph has no name, but font supports glyph naming.\n" - "Skipping glyph U+%0X, file %s", - pg, - file_name.c_str ())); + 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 == string (".notdef") && is_ttf) glyph_name[0] = '\0'; - + if (glyph_name[0] == '\0' && is_ttf) - { - // access by glyph index directly. - get_glyph_index_name (glyph_name, pg); - } - + // Access by glyph index directly. + get_glyph_index_name (glyph_name, pg); + if (glyph_name[0] == '\0') { - /* - CID entry - */ + // CID entry cid_keyed = true; char_id = scm_from_uint32 (pg); } else char_id = scm_from_locale_string (glyph_name); - + *tail = scm_cons (scm_list_4 (scm_from_double (ggeo.width * scale_), scm_from_double (ggeo.x_offset * scale_), scm_from_double (ggeo.y_offset * scale_), - char_id), SCM_EOL); tail = SCM_CDRLOC (*tail); } - pango_glyph_string_free (pgs); + pango_glyph_string_free (pgs); pgs = 0; PangoFontDescription *descr = pango_font_describe (pa->font); Real size = pango_font_description_get_size (descr) - / (Real (PANGO_SCALE)); - + / (Real (PANGO_SCALE)); if (!ps_name_str0) warning (_f ("no PostScript font name for font `%s'", file_name)); @@ -234,8 +233,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, && (file_name.find (".otf") != NPOS || file_name.find (".cff") != NPOS)) { - - /* UGH: kludge a PS name for OTF/CFF fonts. */ + // UGH: kludge a PS name for OTF/CFF fonts. string name = file_name; ssize idx = file_name.find (".otf"); if (idx == NPOS) @@ -246,11 +244,11 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, ssize slash_idx = name.rfind ('/'); if (slash_idx != NPOS) { - slash_idx ++; + slash_idx ++; name = name.substr (slash_idx, name.length () - slash_idx); } - + string initial = name.substr (0, 1); initial = String_convert::to_upper (initial); name = name.substr (1, name.length () - 1); @@ -262,7 +260,9 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, if (ps_name.length ()) { - ((Pango_font *) this)->register_font_file (file_name, ps_name); + ((Pango_font *) this)->register_font_file (file_name, + ps_name, + face_index); pango_fc_font_unlock_face (fcfont); SCM expr = scm_list_5 (ly_symbol2scm ("glyph-string"), @@ -284,13 +284,12 @@ 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 { @@ -298,7 +297,8 @@ Pango_font::text_stencil (string str) const } Stencil -Pango_font::text_stencil (string str, bool tight) const +Pango_font::text_stencil (string str, + bool tight) const { GList *items = pango_itemize (context_, @@ -317,7 +317,7 @@ Pango_font::text_stencil (string str, bool tight) const if (item->analysis.level == PANGO_DIRECTION_RTL) text_dir = LEFT; } - + for (GList *ptr = items; ptr; ptr = ptr->next) { PangoItem *item = (PangoItem *) ptr->data; @@ -330,11 +330,9 @@ Pango_font::text_stencil (string str, bool tight) const last_x = item_stencil.extent (X_AXIS)[RIGHT]; } else if (text_dir == LEFT) - { - dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS); - } + dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS); -#if 0 /* Check extents. */ +#if 0 // Check extents. if (!item_stencil.extent_box ()[X_AXIS].is_empty ()) { Stencil frame = Lookup::frame (item_stencil.extent_box (), 0.1, 0.1); @@ -344,24 +342,19 @@ Pango_font::text_stencil (string str, bool tight) const dest.add_stencil (frame); } #endif - + dest.add_stencil (item_stencil); } - /* - UGH. Should have flags per output format signifying supported - options. - */ + // UGH. Should have flags per output format signifying supported + // options. string name = get_output_backend_name (); if (name != "ps" && name != "eps") { - /* - For Pango based backends, we take a shortcut. - */ - SCM exp - = scm_list_3 (ly_symbol2scm ("utf-8-string"), - ly_string2scm (description_string ()), - ly_string2scm (str)); + // For Pango based backends, we take a shortcut. + SCM exp = scm_list_3 (ly_symbol2scm ("utf-8-string"), + ly_string2scm (description_string ()), + ly_string2scm (str)); Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ()); @@ -382,11 +375,10 @@ Pango_font::description_string () const return s; } - SCM Pango_font::font_file_name () const { return SCM_BOOL_F; } -#endif +#endif // HAVE_PANGO_FT2