X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=a4fea75109bcb15141db97da016cd30d291375a2;hb=068eadf4ad2d70a0eec8589921ed6a12742b6c63;hp=65b8ed016f562b6fd7495a02ceca59f057b16d4a;hpb=f5ef05f0a4a4ae8ad440d7b8581b4a719715008a;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 65b8ed016f..a4fea75109 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -1,54 +1,69 @@ /* - pango-font.cc -- implement Pango_font + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2011 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 . */ -#define PANGO_ENABLE_BACKEND // ugh, why necessary? +// Necessary for supporting pango_context_new() and +// pango_context_set_font_map() in Pango < 1.22 +#define PANGO_ENABLE_BACKEND + #include +#include -/* Ugh. */ -#include "pango-font.hh" +#include +#include + +// Ugh. +#include "pango-font.hh" #include "dimensions.hh" #include "file-name.hh" #include "international.hh" -#include "lookup.hh" +#include "lookup.hh" // debugging #include "main.hh" #include "string-convert.hh" #include "warn.hh" +#include "all-font-metrics.hh" +#include "program-option.hh" #if HAVE_PANGO_FT2 #include "stencil.hh" Pango_font::Pango_font (PangoFT2FontMap *fontmap, - PangoFontDescription *description, + 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_font_map_create_context (fontmap); + context_ = pango_context_new (); + pango_context_set_font_map (context_, PANGO_FONT_MAP (fontmap)); 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); @@ -62,11 +77,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_, - scm_makfrom0str (ps_name.c_str ()), - scm_makfrom0str (filename.c_str ())); + ly_string2scm (ps_name), + scm_list_2 (ly_string2scm (filename), + scm_from_int (face_index))); } void @@ -75,76 +93,76 @@ Pango_font::derived_mark () const scm_gc_mark (physical_font_tab_); } - -Index_to_charcode_map const * -Pango_font::get_index_to_charcode_map (string key, FT_Face face) +void +get_glyph_index_name (char *s, + FT_ULong code) { - if (charcode_maps_.find (key) == charcode_maps_.end ()) - charcode_maps_[key] = make_index_to_charcode_map (face); - - if (charcode_maps_.find (key) == charcode_maps_.end ()) - return 0; - - return &charcode_maps_[key]; + 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) const +Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) 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); + PangoAnalysis const *pa = &(glyph_item->item->analysis); + PangoGlyphString *pgs = glyph_item->glyphs; PangoRectangle logical_rect; PangoRectangle ink_rect; pango_glyph_string_extents (pgs, pa->font, &ink_rect, &logical_rect); - PangoFcFont *fcfont = G_TYPE_CHECK_INSTANCE_CAST (pa->font, - PANGO_TYPE_FC_FONT, - PangoFcFont); + PangoFcFont *fcfont = PANGO_FC_FONT (pa->font); FT_Face ftface = pango_fc_font_lock_face (fcfont); - Box b (Interval (PANGO_LBEARING (ink_rect), - PANGO_RBEARING (ink_rect)), + + Box b (Interval (PANGO_LBEARING (logical_rect), + PANGO_RBEARING (logical_rect)), Interval (-PANGO_DESCENT (ink_rect), PANGO_ASCENT (ink_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 = ((Pango_font*)this)->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; @@ -152,57 +170,72 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const PangoGlyph pg = pgi->glyph; PangoGlyphGeometry ggeo = pgi->geometry; + /* + Zero-width characters are valid Unicode characters, + but glyph lookups need to be skipped. + */ + if (!(pg ^ PANGO_GLYPH_EMPTY)) + continue; + glyph_name[0] = '\0'; if (has_glyph_names) { - int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); + FT_Error errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, + GLYPH_NAME_LEN); if (errorcode) - programming_error ("FT_Get_Glyph_Name returns error"); + programming_error ( + _f ("FT_Get_Glyph_Name () error: %s", + freetype_error_string (errorcode).c_str ())); } - + SCM char_id = SCM_EOL; if (glyph_name[0] == '\0' && 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); } - if (glyph_name[0] == '\0' && has_glyph_names) + if (glyph_name[0] == '\0' && has_glyph_names) { - programming_error ("Glyph has no name, but font supports glyph naming. Skipping glyph: " - + description_string ()); + 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); + if (glyph_name[0] == '\0') { - /* - CID entry - */ + // CID entry cid_keyed = true; char_id = scm_from_uint32 (pg); } else - char_id = scm_makfrom0str (glyph_name); - + 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_), - + scm_from_double (- ggeo.y_offset * scale_), char_id), SCM_EOL); tail = SCM_CDRLOC (*tail); } + 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)); @@ -213,8 +246,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const && (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) @@ -225,11 +257,11 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const 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); @@ -241,11 +273,13 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const 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"), - scm_makfrom0str (ps_name.c_str ()), + ly_string2scm (ps_name), scm_from_double (size), scm_from_bool (cid_keyed), ly_quote_scm (glyph_exprs)); @@ -263,78 +297,91 @@ Pango_font::physical_font_tab () const return physical_font_tab_; } +extern bool music_strings_to_paths; + Stencil -Pango_font::text_stencil (string str) const +Pango_font::text_stencil (Output_def * /* state */, + string str, bool music_string) const { - GList *items - = pango_itemize (context_, - str.c_str (), - 0, str.length (), attribute_list_, - NULL); + /* + The text assigned to a PangoLayout is automatically divided + into sections and reordered according to the Unicode + Bidirectional Algorithm, if necessary. + */ + PangoLayout *layout = pango_layout_new (context_); + pango_layout_set_text (layout, str.c_str (), -1); + GSList *lines = pango_layout_get_lines (layout); Stencil dest; - Real last_x = 0.0; - Direction text_dir = RIGHT; - for (GList *p = items; p; p = p->next) + for (GSList *l = lines; l; l = l->next) { - PangoItem *item = (PangoItem *) p->data; - if (item->analysis.level == PANGO_DIRECTION_RTL) - text_dir = LEFT; - } - - for (GList *ptr = items; ptr; ptr = ptr->next) - { - PangoItem *item = (PangoItem *) ptr->data; + PangoLayoutLine *line = (PangoLayoutLine *) l->data; + GSList *layout_runs = line->runs; - Stencil item_stencil = pango_item_string_stencil (item, str); - - if (text_dir == RIGHT) + for (GSList *p = layout_runs; p; p = p->next) { + PangoGlyphItem *item = (PangoGlyphItem *) p->data; + Stencil item_stencil = pango_item_string_stencil (item); + item_stencil.translate_axis (last_x, X_AXIS); last_x = item_stencil.extent (X_AXIS)[RIGHT]; - } - else if (text_dir == LEFT) - { - dest.translate_axis (item_stencil.extent (X_AXIS)[RIGHT], X_AXIS); - } -#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); - Box empty; - empty.set_empty (); - Stencil dimless_frame (empty, frame.expr ()); - dest.add_stencil (frame); - } +#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); + Box empty; + empty.set_empty (); + Stencil dimless_frame (empty, frame.expr ()); + dest.add_stencil (frame); + } #endif - - dest.add_stencil (item_stencil); + + dest.add_stencil (item_stencil); + } } - /* - UGH. Should have flags per output format signifying supported - options. - */ - if (output_backend_global != "ps" - && output_backend_global != "eps") + string name = get_output_backend_name (); + string output_mod = "scm output-" + name; + SCM mod = scm_c_resolve_module (output_mod.c_str ()); + + bool has_utf8_string = false; + + if (ly_is_module (mod)) { + SCM utf8_string = ly_module_lookup (mod, ly_symbol2scm ("utf-8-string")); /* - For Pango based backends, we take a shortcut. + has_utf8_string should only be true when utf8_string is a + variable that is bound to a *named* procedure, i.e. not a + lambda expression. */ - SCM exp - = scm_list_3 (ly_symbol2scm ("utf-8-string"), - scm_makfrom0str (description_string ().c_str ()), - scm_makfrom0str (str.c_str ())); + if (utf8_string != SCM_BOOL_F + && scm_procedure_name (SCM_VARIABLE_REF (utf8_string)) != SCM_BOOL_F) + has_utf8_string = true; + } + + bool to_paths = music_strings_to_paths; + + /* + Backends with the utf-8-string expression use it when + 1) the -dmusic-strings-to-paths option is set + and `str' is not a music string, or + 2) the -dmusic-strings-to-paths option is not set. + */ + if (has_utf8_string && ((to_paths && !music_string) || !to_paths)) + { + // 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 ()); return Stencil (b, exp); } - return dest; } @@ -347,11 +394,10 @@ Pango_font::description_string () const return s; } - SCM Pango_font::font_file_name () const { return SCM_BOOL_F; } -#endif +#endif // HAVE_PANGO_FT2