X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=aa2c7f35c40410964a24a02bbadb642b6fbd8ded;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=7d50025c388197c9629e84a48fa55d3ecaea791c;hpb=13a8e28de140702edbb0629002073972008e17ad;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 7d50025c38..aa2c7f35c4 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -3,37 +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 (); @@ -66,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 @@ -77,22 +81,6 @@ Pango_font::derived_mark () const } -map filename_charcode_maps_map; -Index_to_charcode_map const *get_index_to_charcode_map (string postscript_name, FT_Face face); - - -Index_to_charcode_map const * -get_index_to_charcode_map (string filename, FT_Face face) -{ - if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ()) - filename_charcode_maps_map[filename] = make_index_to_charcode_map (face); - - if (filename_charcode_maps_map.find (filename) == filename_charcode_maps_map.end ()) - return 0; - - return &filename_charcode_maps_map[filename]; -} - void get_glyph_index_name (char *s, FT_ULong code) { @@ -117,7 +105,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, 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); @@ -160,7 +148,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, Index_to_charcode_map const *cmap = 0; bool has_glyph_names = ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES; if (! has_glyph_names) - cmap = 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; @@ -176,14 +164,14 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, { 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. */ && is_ttf && cmap->find (pg) != cmap->end ()) { @@ -200,6 +188,10 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string 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. @@ -215,7 +207,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, 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_), @@ -226,6 +218,8 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, 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)); @@ -272,7 +266,7 @@ Pango_font::pango_item_string_stencil (PangoItem const *item, string str, 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)); @@ -358,22 +352,23 @@ Pango_font::text_stencil (string str, bool tight) 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; }