X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=0dd963386040866fe62a92ddfce594c3ecc75fb8;hb=aca86deb9ab56c5644b98fb5b78069c9442a53ba;hp=c0218074672d459ae8fd0731a440d01732a158db;hpb=df7667c81afced0f9d6422b5cbaaf49fd5b3ae1f;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index c021807467..0dd9633860 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2005 Han-Wen Nienhuys + (c) 2004--2006 Han-Wen Nienhuys */ #define PANGO_ENABLE_BACKEND // ugh, why necessary? @@ -14,23 +14,22 @@ #include "dimensions.hh" #include "file-name.hh" +#include "international.hh" #include "lookup.hh" #include "main.hh" +#include "string-convert.hh" #include "warn.hh" #if HAVE_PANGO_FT2 #include "stencil.hh" Pango_font::Pango_font (PangoFT2FontMap *fontmap, - Direction dir, PangoFontDescription *description, Real output_scale) { (void) fontmap; physical_font_tab_ = scm_c_make_hash_table (11); - PangoDirection pango_dir = (dir == RIGHT) - ? PANGO_DIRECTION_LTR - : PANGO_DIRECTION_RTL; + PangoDirection pango_dir = PANGO_DIRECTION_LTR; context_ = pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION); // context_ = pango_ft2_font_map_create_context (fontmap); @@ -44,6 +43,7 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap, --hwn */ + output_scale_ = output_scale; scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); /* @@ -62,11 +62,11 @@ 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) { scm_hash_set_x (physical_font_tab_, - scm_makfrom0str (ps_name.to_str0 ()), - scm_makfrom0str (filename.to_str0 ())); + scm_makfrom0str (ps_name.c_str ()), + scm_makfrom0str (filename.c_str ())); } void @@ -75,16 +75,39 @@ 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) +{ + 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]; +} + +void +get_unicode_name (char*s, FT_ULong code) +{ + if (code > 0xFFFF) + sprintf (s, "u%lX", code); + else + sprintf (s, "uni%04lX", code); +} + + Stencil -Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) const +Pango_font::pango_item_string_stencil (PangoItem const *item, string str) const { const int GLYPH_NAME_LEN = 256; char glyph_name[GLYPH_NAME_LEN]; - PangoAnalysis *pa = &(item->analysis); + PangoAnalysis const *pa = &(item->analysis); PangoGlyphString *pgs = pango_glyph_string_new (); - pango_shape (str.to_str0 () + item->offset, - item->length, pa, pgs); + pango_shape (str.c_str () + item->offset, + item->length, (PangoAnalysis*) pa, pgs); PangoRectangle logical_rect; PangoRectangle ink_rect; @@ -101,10 +124,25 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con PANGO_ASCENT (ink_rect))); b.scale (scale_); + char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); + FcPattern *fcpat = fcfont->font_pattern; + char *file_name_as_ptr = 0; + FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name_as_ptr); + + string file_name; + if (file_name_as_ptr) + { + /* Normalize file name. */ + file_name = File_name (file_name_as_ptr).to_string (); + } SCM glyph_exprs = SCM_EOL; SCM *tail = &glyph_exprs; - + + Index_to_charcode_map const *cmap = 0; + if (! (ftface->face_flags & FT_FACE_FLAG_GLYPH_NAMES)) + cmap = ((Pango_font*)this)->get_index_to_charcode_map (file_name, ftface); + bool cid_keyed = false; for (int i = 0; i < pgs->num_glyphs; i++) { @@ -115,24 +153,31 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); - - SCM char_id; + SCM char_id; + if (glyph_name[0] == '\0' && cmap) + { + FT_ULong char_code = cmap->find (pg)->second; + get_unicode_name (glyph_name, char_code); + } + + if (glyph_name[0] == '\0') { /* CID entry - */ + */ cid_keyed = true; char_id = scm_from_int (pg); } else char_id = scm_makfrom0str (glyph_name); - *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_ - + dx), + + *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); - dx = 0.0; tail = SCM_CDRLOC (*tail); } @@ -140,42 +185,37 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con Real size = pango_font_description_get_size (descr) / (Real (PANGO_SCALE)); - FcPattern *fcpat = fcfont->font_pattern; - char *file_name = 0; - FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name); -#ifdef __MINGW32__ - /* Normalize file name. */ - // FIXME: memleak(s?), drop the #ifdef? - file_name = File_name (file_name).to_string ().get_copy_str0 (); -#endif - - char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); if (!ps_name_str0) warning (_f ("no PostScript font name for font `%s'", file_name)); - String ps_name; + string ps_name; if (!ps_name_str0 - && file_name - && (String (file_name).index (".otf") >= 0 - || String (file_name).index (".cff") >= 0)) + && file_name != "" + && (file_name.find (".otf") != NPOS + || file_name.find (".cff") != NPOS)) { /* UGH: kludge a PS name for OTF/CFF fonts. */ - String name = file_name; - int idx = max (String (file_name).index (".otf"), - String (file_name).index (".cff")); + string name = file_name; + ssize idx = file_name.find (".otf"); + if (idx == NPOS) + idx = file_name.find (".cff"); - name = name.left_string (idx); + name = name.substr (0, idx); - int slash_idx = name.index_last ('/'); - if (slash_idx >= 0) - name = name.right_string (name.length () - slash_idx - 1); - - String initial = name.cut_string (0, 1); - initial.to_upper (); - name = name.nomid_string (0, 1); - name.to_lower (); + ssize slash_idx = name.rfind ('/'); + if (slash_idx != NPOS) + { + 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); + name = String_convert::to_lower (name); ps_name = initial + name; } else if (ps_name_str0) @@ -185,9 +225,9 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con { ((Pango_font *) this)->register_font_file (file_name, ps_name); pango_fc_font_unlock_face (fcfont); - + SCM expr = scm_list_5 (ly_symbol2scm ("glyph-string"), - scm_makfrom0str (ps_name.to_str0 ()), + scm_makfrom0str (ps_name.c_str ()), scm_from_double (size), scm_from_bool (cid_keyed), ly_quote_scm (glyph_exprs)); @@ -206,27 +246,54 @@ Pango_font::physical_font_tab () const } Stencil -Pango_font::text_stencil (String str) const +Pango_font::text_stencil (string str) const { - GList *items = pango_itemize (context_, - str.to_str0 (), - 0, str.length (), attribute_list_, - NULL); + GList *items + = pango_itemize (context_, + str.c_str (), + 0, str.length (), attribute_list_, + NULL); - GList *ptr = items; Stencil dest; - Real x = 0.0; - while (ptr) + + Real last_x = 0.0; + + Direction text_dir = RIGHT; + for (GList *p = items; p; p = p->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; - Stencil item_stencil = pango_item_string_stencil (item, str, x); + Stencil item_stencil = pango_item_string_stencil (item, str); - x = item_stencil.extent (X_AXIS)[RIGHT]; + if (text_dir == RIGHT) + { + 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); + } +#endif + dest.add_stencil (item_stencil); - - ptr = ptr->next; } /* @@ -241,9 +308,9 @@ Pango_font::text_stencil (String str) const */ char *descr_string = pango_font_description_to_string (pango_description_); SCM exp - = scm_list_3 (ly_symbol2scm ("utf8-string"), + = scm_list_3 (ly_symbol2scm ("utf-8-string"), scm_makfrom0str (descr_string), - scm_makfrom0str (str.to_str0 ())); + scm_makfrom0str (str.c_str ())); g_free (descr_string); @@ -252,17 +319,6 @@ Pango_font::text_stencil (String str) const return Stencil (b, exp); } -#if 0 - // check extents. - if (!dest.extent_box ()[X_AXIS].is_empty ()) - { - Stencil frame = Lookup::frame (dest.extent_box (), 0.1, 0.1); - Box empty; - empty.set_empty (); - Stencil dimless_frame (empty, frame.expr ()); - dest.add_stencil (frame); - } -#endif return dest; }