X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=21ab85ab667052697d8038e1aea8a59f5f792f14;hb=25233e40ae1a31b50f949a1d6b4146d01ac9350a;hp=f4a4922f240d7e98c224d31e5eb4979430cc85e1;hpb=50163d8198f9cdb0308a4643a6afa1d6ed053ce1;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index f4a4922f24..21ab85ab66 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2009 Han-Wen Nienhuys + Copyright (C) 2004--2010 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 @@ -17,7 +17,10 @@ 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 @@ -40,14 +43,14 @@ #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) { 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_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 (); @@ -108,8 +111,7 @@ get_unicode_name (char *s, } Stencil -Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item, - bool tight_bbox) const +Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const { const int GLYPH_NAME_LEN = 256; char glyph_name[GLYPH_NAME_LEN]; @@ -121,19 +123,15 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item, 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); - 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))); + Interval (-PANGO_DESCENT (ink_rect), + PANGO_ASCENT (ink_rect))); + b.scale (scale_); char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); @@ -172,11 +170,18 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item, 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 ( _f ("FT_Get_Glyph_Name () error: %s", @@ -220,7 +225,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item, *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); @@ -292,22 +297,11 @@ Pango_font::physical_font_tab () const return physical_font_tab_; } -Stencil -Pango_font::word_stencil (string str, bool feta) const -{ - return text_stencil (str, feta, true); -} - -Stencil -Pango_font::text_stencil (string str, bool feta) const -{ - return text_stencil (str, feta, false); -} +extern bool music_strings_to_paths; Stencil -Pango_font::text_stencil (string str, - bool feta, - bool tight) const +Pango_font::text_stencil (Output_def *state, + string str, bool music_string) const { /* The text assigned to a PangoLayout is automatically divided @@ -316,32 +310,37 @@ Pango_font::text_stencil (string str, */ PangoLayout *layout = pango_layout_new (context_); pango_layout_set_text (layout, str.c_str (), -1); - PangoLayoutLine *line = pango_layout_get_line (layout, 0); - GSList *layout_runs = line->runs; + GSList *lines = pango_layout_get_lines (layout); Stencil dest; Real last_x = 0.0; - for (GSList *p = layout_runs; p; p = p->next) + for (GSList *l = lines; l; l = l->next) { - PangoGlyphItem *item = (PangoGlyphItem *) p->data; - Stencil item_stencil = pango_item_string_stencil (item, tight); + PangoLayoutLine *line = (PangoLayoutLine *) l->data; + GSList *layout_runs = line->runs; + + 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]; + item_stencil.translate_axis (last_x, X_AXIS); + last_x = item_stencil.extent (X_AXIS)[RIGHT]; #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 (!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); + } } string name = get_output_backend_name (); @@ -355,21 +354,23 @@ Pango_font::text_stencil (string str, SCM utf8_string = ly_module_lookup (mod, ly_symbol2scm ("utf-8-string")); /* has_utf8_string should only be true when utf8_string is a - variable that is bound to a *named* procedure. + variable that is bound to a *named* procedure, i.e. not a + lambda expression. */ if (utf8_string != SCM_BOOL_F && scm_procedure_name (SCM_VARIABLE_REF (utf8_string)) != SCM_BOOL_F) has_utf8_string = true; } - /* - The SVG backend only uses utf-8-string for the non-music - fonts, hence the check here. --pmccarty + bool to_paths = music_strings_to_paths; - TODO: use a program option (-dmusic-strings-to-paths) here - instead that is enabled only when -dbackend=svg. + /* + 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 ((name == "svg" && !feta) || (name != "svg" && has_utf8_string)) + 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"),