X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=aa2c7f35c40410964a24a02bbadb642b6fbd8ded;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=12fa4f3da8c03205c01efdc718f647d554d585d4;hpb=355ab15d82816386df2be05aebd4fa5088e80352;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 12fa4f3da8..aa2c7f35c4 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -3,36 +3,41 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2006 Han-Wen Nienhuys + (c) 2004--2008 Han-Wen Nienhuys */ #define PANGO_ENABLE_BACKEND // ugh, why necessary? #include +#include + +#include /* Ugh. */ -#include "pango-font.hh" +#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); pango_description_ = pango_font_description_copy (description); attribute_list_ = pango_attr_list_new (); @@ -65,8 +70,8 @@ void Pango_font::register_font_file (string filename, string ps_name) { scm_hash_set_x (physical_font_tab_, - scm_makfrom0str (ps_name.c_str ()), - scm_makfrom0str (filename.c_str ())); + ly_string2scm (ps_name), + ly_string2scm (filename)); } void @@ -76,16 +81,10 @@ Pango_font::derived_mark () const } -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 @@ -99,13 +98,14 @@ 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]; PangoAnalysis const *pa = &(item->analysis); PangoGlyphString *pgs = pango_glyph_string_new (); - + pango_shape (str.c_str () + item->offset, item->length, (PangoAnalysis*) pa, pgs); @@ -119,9 +119,13 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const FT_Face ftface = pango_fc_font_lock_face (fcfont); - PangoRectangle const *which_rect = &logical_rect; - Box b (Interval (PANGO_LBEARING (*which_rect), - PANGO_RBEARING (*which_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))); @@ -144,8 +148,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 = all_fonts_global->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++) { @@ -159,16 +164,16 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const { int 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); @@ -176,11 +181,23 @@ 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: " - + 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') { /* @@ -190,7 +207,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const 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_), @@ -201,6 +218,8 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const 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)); @@ -247,7 +266,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const 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)); @@ -265,8 +284,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_, @@ -290,7 +322,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) { @@ -320,22 +352,23 @@ Pango_font::text_stencil (string str) const 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 (); + if (name != "ps" && name != "eps") { /* For Pango based backends, we take a shortcut. */ SCM exp = scm_list_3 (ly_symbol2scm ("utf-8-string"), - scm_makfrom0str (description_string ().c_str ()), - scm_makfrom0str (str.c_str ())); + ly_string2scm (description_string ()), + ly_string2scm (str)); Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ()); return Stencil (b, exp); } + g_list_free (items); return dest; }