X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=32e7a89c024677b2473fb6443364b5840d7f6236;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=a4fea75109bcb15141db97da016cd30d291375a2;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index a4fea75109..32e7a89c02 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--2011 Han-Wen Nienhuys + Copyright (C) 2004--2012 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 @@ -33,7 +33,7 @@ #include "dimensions.hh" #include "file-name.hh" #include "international.hh" -#include "lookup.hh" // debugging +#include "lookup.hh" // debugging #include "main.hh" #include "string-convert.hh" #include "warn.hh" @@ -44,9 +44,13 @@ #include "stencil.hh" Pango_font::Pango_font (PangoFT2FontMap *fontmap, - PangoFontDescription const *description, - Real output_scale) + PangoFontDescription const *description, + Real output_scale) { + // This line looks stupid, but if we don't initialize physical_font_tab_ before + // we allocate memory in scm_c_make_hash_table, then that could trigger a garbage + // collection. + physical_font_tab_ = SCM_EOL; physical_font_tab_ = scm_c_make_hash_table (11); PangoDirection pango_dir = PANGO_DIRECTION_LTR; context_ = pango_context_new (); @@ -61,7 +65,7 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap, // --hwn output_scale_ = output_scale; scale_ = INCH_TO_BP - / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); + / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); // ugh. Should make this configurable. pango_context_set_language (context_, pango_language_from_string ("en_US")); @@ -78,13 +82,13 @@ Pango_font::~Pango_font () void Pango_font::register_font_file (string filename, - string ps_name, - int face_index) + string ps_name, + int face_index) { scm_hash_set_x (physical_font_tab_, - ly_string2scm (ps_name), - scm_list_2 (ly_string2scm (filename), - scm_from_int (face_index))); + ly_string2scm (ps_name), + scm_list_2 (ly_string2scm (filename), + scm_from_int (face_index))); } void @@ -95,14 +99,14 @@ Pango_font::derived_mark () const void get_glyph_index_name (char *s, - FT_ULong code) + FT_ULong code) { sprintf (s, "glyphIndex%lX", code); } void get_unicode_name (char *s, - FT_ULong code) + FT_ULong code) { if (code > 0xFFFF) sprintf (s, "u%lX", code); @@ -128,9 +132,9 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const FT_Face ftface = pango_fc_font_lock_face (fcfont); Box b (Interval (PANGO_LBEARING (logical_rect), - PANGO_RBEARING (logical_rect)), - Interval (-PANGO_DESCENT (ink_rect), - PANGO_ASCENT (ink_rect))); + PANGO_RBEARING (logical_rect)), + Interval (-PANGO_DESCENT (ink_rect), + PANGO_ASCENT (ink_rect))); b.scale (scale_); @@ -157,8 +161,7 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) 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 = all_fonts_global->get_index_to_charcode_map ( - file_name, face_index, ftface); + 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; @@ -171,71 +174,69 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const PangoGlyphGeometry ggeo = pgi->geometry; /* - Zero-width characters are valid Unicode characters, - but glyph lookups need to be skipped. + Zero-width characters are valid Unicode characters, + but glyph lookups need to be skipped. */ if (!(pg ^ PANGO_GLYPH_EMPTY)) - continue; + continue; glyph_name[0] = '\0'; if (has_glyph_names) - { - 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", - freetype_error_string (errorcode).c_str ())); - } + { + 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", + freetype_error_string (errorcode).c_str ())); + } SCM char_id = SCM_EOL; if (glyph_name[0] == '\0' - && cmap - && is_ttf - && cmap->find (pg) != cmap->end ()) - { - FT_ULong char_code = cmap->find (pg)->second; - get_unicode_name (glyph_name, char_code); - } + && cmap + && 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) - { - 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; - } + { + 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'; + 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_keyed = true; - char_id = scm_from_uint32 (pg); - } + { + // CID entry + cid_keyed = true; + char_id = scm_from_uint32 (pg); + } else - char_id = scm_from_locale_string (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_), - char_id), - SCM_EOL); + scm_from_double (ggeo.x_offset * scale_), + scm_from_double (- ggeo.y_offset * scale_), + char_id), + SCM_EOL); tail = SCM_CDRLOC (*tail); } - + pango_fc_font_unlock_face (fcfont); 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)); @@ -244,23 +245,23 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const if (!ps_name_str0 && file_name != "" && (file_name.find (".otf") != NPOS - || file_name.find (".cff") != NPOS)) + || file_name.find (".cff") != NPOS)) { // UGH: kludge a PS name for OTF/CFF fonts. string name = file_name; ssize idx = file_name.find (".otf"); if (idx == NPOS) - idx = file_name.find (".cff"); + idx = file_name.find (".cff"); name = name.substr (0, idx); ssize slash_idx = name.rfind ('/'); if (slash_idx != NPOS) - { - slash_idx ++; - name = name.substr (slash_idx, - name.length () - 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); @@ -274,15 +275,15 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const if (ps_name.length ()) { ((Pango_font *) this)->register_font_file (file_name, - ps_name, - face_index); + ps_name, + face_index); pango_fc_font_unlock_face (fcfont); SCM expr = scm_list_5 (ly_symbol2scm ("glyph-string"), - ly_string2scm (ps_name), - scm_from_double (size), - scm_from_bool (cid_keyed), - ly_quote_scm (glyph_exprs)); + ly_string2scm (ps_name), + scm_from_double (size), + scm_from_bool (cid_keyed), + ly_quote_scm (glyph_exprs)); return Stencil (b, expr); } @@ -301,7 +302,7 @@ extern bool music_strings_to_paths; Stencil Pango_font::text_stencil (Output_def * /* state */, - string str, bool music_string) const + string str, bool music_string) const { /* The text assigned to a PangoLayout is automatically divided @@ -321,26 +322,26 @@ Pango_font::text_stencil (Output_def * /* state */, 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); + { + 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 (); @@ -353,13 +354,13 @@ Pango_font::text_stencil (Output_def * /* state */, { 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, i.e. not a - lambda expression. + 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. */ if (utf8_string != SCM_BOOL_F - && scm_procedure_name (SCM_VARIABLE_REF (utf8_string)) != SCM_BOOL_F) - has_utf8_string = true; + && scm_procedure_name (SCM_VARIABLE_REF (utf8_string)) != SCM_BOOL_F) + has_utf8_string = true; } bool to_paths = music_strings_to_paths; @@ -374,8 +375,8 @@ Pango_font::text_stencil (Output_def * /* state */, { // 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)); + ly_string2scm (description_string ()), + ly_string2scm (str)); Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ());