X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=aa2c7f35c40410964a24a02bbadb642b6fbd8ded;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=de7b835ab85f47e9b1065c83512fb0f30068f956;hpb=7533822f4cff54c8cb39ae96e0bff9f8b292c314;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index de7b835ab8..aa2c7f35c4 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -3,35 +3,41 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2005 Han-Wen Nienhuys + (c) 2004--2008 Han-Wen Nienhuys */ #define PANGO_ENABLE_BACKEND // ugh, why necessary? - #include +#include + +#include + +/* Ugh. */ -#include "main.hh" -#include "lookup.hh" -#include "dimensions.hh" #include "pango-font.hh" +#include "dimensions.hh" +#include "file-name.hh" +#include "international.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, - Direction dir, - PangoFontDescription *description, + PangoFontDescription const *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); pango_description_ = pango_font_description_copy (description); attribute_list_ = pango_attr_list_new (); @@ -42,6 +48,7 @@ Pango_font::Pango_font (PangoFT2FontMap *fontmap, --hwn */ + output_scale_ = output_scale; scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); /* @@ -60,11 +67,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 ())); + ly_string2scm (ps_name), + ly_string2scm (filename)); } void @@ -73,16 +80,34 @@ Pango_font::derived_mark () const scm_gc_mark (physical_font_tab_); } + +void +get_glyph_index_name (char *s, FT_ULong code) +{ + sprintf (s, "glyphIndex%lX", code); +} + +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, + bool tight_bbox) 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; @@ -93,15 +118,40 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con PangoFcFont); FT_Face ftface = pango_fc_font_lock_face (fcfont); - Box b (Interval (PANGO_LBEARING (ink_rect), - PANGO_RBEARING (ink_rect)), - Interval (-PANGO_DESCENT (ink_rect), - PANGO_ASCENT (ink_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))); b.scale (scale_); + char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); + FcPattern *fcpat = fcfont->font_pattern; + FcChar8 *file_name_as_ptr = 0; + FcPatternGetString (fcpat, FC_FILE, 0, &file_name_as_ptr); + string file_name; + if (file_name_as_ptr) + { + /* Normalize file name. */ + file_name = File_name ((char const *)file_name_as_ptr).to_string (); + } + SCM glyph_exprs = SCM_EOL; SCM *tail = &glyph_exprs; + + 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, 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++) { PangoGlyphInfo *pgi = pgs->glyphs + i; @@ -109,65 +159,102 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con PangoGlyph pg = pgi->glyph; PangoGlyphGeometry ggeo = pgi->geometry; - FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); + glyph_name[0] = '\0'; + if (has_glyph_names) + { + int 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); + } - SCM char_id; + 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; + } + + + 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') { /* CID entry - */ - char_id = scm_from_int (pg); + */ + cid_keyed = true; + char_id = scm_from_uint32 (pg); } else - char_id = scm_makfrom0str (glyph_name); - *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_ + dx), + 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); - dx = 0.0; 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)); - FcPattern *fcpat = fcfont->font_pattern; - char *filename = 0; - FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & filename); - char const *ps_name_str0 = FT_Get_Postscript_Name (ftface); if (!ps_name_str0) - warning (_f ("no PostScript font name for font `%s'", filename)); + warning (_f ("no PostScript font name for font `%s'", file_name)); - String ps_name; + string ps_name; if (!ps_name_str0 - && filename - && (String (filename).index (".otf") >= 0 - || String (filename).index (".cff") >= 0)) + && file_name != "" + && (file_name.find (".otf") != NPOS + || file_name.find (".cff") != NPOS)) { - /* - UGH: kludge a PS name for OTF/CFF fonts. - - */ + /* 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"); - String name = filename; - int idx = max (String (filename).index (".otf"), - String (filename).index (".cff")); + name = name.substr (0, idx); - name = name.left_string (idx); - - int slash_idx = name.index_last ('/'); // UGh. What's happens on windows? - 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) @@ -175,21 +262,20 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con if (ps_name.length ()) { - ((Pango_font *) this)->register_font_file (filename, ps_name); + ((Pango_font *) this)->register_font_file (file_name, ps_name); pango_fc_font_unlock_face (fcfont); - - SCM expr = scm_list_4 (ly_symbol2scm ("glyph-string"), - scm_makfrom0str (ps_name.to_str0 ()), + + 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)); return Stencil (b, expr); } - else - { - warning (_ ("FreeType face has no PostScript font name")); - return Stencil (); - } + + warning (_ ("FreeType face has no PostScript font name")); + return Stencil (); } SCM @@ -198,68 +284,105 @@ Pango_font::physical_font_tab () const return physical_font_tab_; } + Stencil -Pango_font::text_stencil (String str) const +Pango_font::word_stencil (string str) const { - GList *items = pango_itemize (context_, - str.to_str0 (), - 0, str.length (), attribute_list_, - NULL); + 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_, + 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, tight); - 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; } /* 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. */ - char *descr_string = pango_font_description_to_string (pango_description_); SCM exp - = scm_list_3 (ly_symbol2scm ("utf8-string"), - scm_makfrom0str (descr_string), - scm_makfrom0str (str.to_str0 ())); - - g_free (descr_string); + = scm_list_3 (ly_symbol2scm ("utf-8-string"), + ly_string2scm (description_string ()), + ly_string2scm (str)); Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ()); 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 + g_list_free (items); return dest; } +string +Pango_font::description_string () const +{ + char *descr_string = pango_font_description_to_string (pango_description_); + string s (descr_string); + g_free (descr_string); + return s; +} + + SCM Pango_font::font_file_name () const {