X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=674ed68724555ff4acebeee9d5cf07ede5239231;hb=eb87f600313f2d56a8708e5624b7bc7ec7acf1ff;hp=dbd41e443bed15f0d96383676ee18c73b32fb00e;hpb=b7b68363b15a8f723b55338b613de077ce5e1bdd;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index dbd41e443b..674ed68724 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -1,48 +1,54 @@ /* - pango-font.cc -- implement Pango_font + pango-font.cc -- implement Pango_font source file of the GNU LilyPond music typesetter - (c) 2004 Han-Wen Nienhuys - + (c) 2004--2006 Han-Wen Nienhuys */ - #define PANGO_ENABLE_BACKEND // ugh, why necessary? - #include -#include "main.hh" -#include "lookup.hh" -#include "dimensions.hh" +/* Ugh. */ #include "pango-font.hh" -#if HAVE_PANGO_FT2 -#include "stencil.hh" +#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) + PangoFontDescription *description, + Real output_scale) { - subfonts_ = SCM_EOL; - PangoDirection pango_dir = (dir == RIGHT) - ? PANGO_DIRECTION_LTR - : PANGO_DIRECTION_RTL; - context_ = - pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION); + (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); - // context_ = pango_ft2_font_map_create_context (fontmap); - attribute_list_= pango_attr_list_new(); + attribute_list_ = pango_attr_list_new (); /* - urgh. I don't understand this. Why isn't this 1/(scale * resolution) + urgh. I don't understand this. Why isn't this 1/(scale * + resolution * output_scale) --hwn - */ - scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION)); - + */ + output_scale_ = output_scale; + scale_ = INCH_TO_BP / (Real (PANGO_SCALE) * Real (PANGO_RESOLUTION) * output_scale); + + /* + ugh. Should make this configurable. + */ pango_context_set_language (context_, pango_language_from_string ("en_US")); pango_context_set_base_dir (context_, pango_dir); pango_context_set_font_description (context_, description); @@ -56,147 +62,238 @@ Pango_font::~Pango_font () } void -Pango_font::register_font_file (String filename, String ps_name) +Pango_font::register_font_file (std::string filename, std::string ps_name) { - subfonts_ = scm_cons (scm_makfrom0str (filename.to_str0 ()), - subfonts_); + scm_hash_set_x (physical_font_tab_, + scm_makfrom0str (ps_name.c_str ()), + scm_makfrom0str (filename.c_str ())); } void Pango_font::derived_mark () const { - scm_gc_mark (subfonts_); + scm_gc_mark (physical_font_tab_); } Stencil -Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) const -{ +Pango_font::pango_item_string_stencil (PangoItem const *item, std::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; pango_glyph_string_extents (pgs, pa->font, &ink_rect, &logical_rect); - - PangoFcFont *fcfont = G_TYPE_CHECK_INSTANCE_CAST(pa->font, - PANGO_TYPE_FC_FONT, - PangoFcFont); - + + PangoFcFont *fcfont = G_TYPE_CHECK_INSTANCE_CAST (pa->font, + PANGO_TYPE_FC_FONT, + PangoFcFont); + FT_Face ftface = pango_fc_font_lock_face (fcfont); - Box b (Interval (PANGO_LBEARING(logical_rect), - PANGO_RBEARING(logical_rect)), - Interval (-PANGO_DESCENT(logical_rect), - PANGO_ASCENT(logical_rect))); - + Box b (Interval (PANGO_LBEARING (ink_rect), + PANGO_RBEARING (ink_rect)), + Interval (-PANGO_DESCENT (ink_rect), + PANGO_ASCENT (ink_rect))); + b.scale (scale_); SCM glyph_exprs = SCM_EOL; SCM *tail = &glyph_exprs; + + bool cid_keyed = false; for (int i = 0; i < pgs->num_glyphs; i++) { PangoGlyphInfo *pgi = pgs->glyphs + i; - + PangoGlyph pg = pgi->glyph; PangoGlyphGeometry ggeo = pgi->geometry; FT_Get_Glyph_Name (ftface, pg, glyph_name, GLYPH_NAME_LEN); - *tail = scm_cons (scm_list_3 (scm_from_double (ggeo.x_offset * scale_ + dx), + + SCM char_id; + 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_4 (scm_from_double (ggeo.width * scale_), + scm_from_double (ggeo.x_offset * scale_), scm_from_double (ggeo.y_offset * scale_), - scm_makfrom0str (glyph_name)), + + char_id), SCM_EOL); - dx = 0.0; tail = SCM_CDRLOC (*tail); } PangoFontDescription *descr = pango_font_describe (pa->font); Real size = pango_font_description_get_size (descr) - / (Real (PANGO_SCALE)); - + / (Real (PANGO_SCALE)); + FcPattern *fcpat = fcfont->font_pattern; - char *filename = 0; - FcPatternGetString(fcpat, FC_FILE, 0, (FcChar8 **) &filename); - char const *ps_name = FT_Get_Postscript_Name (ftface); - ((Pango_font *) this)->register_font_file (filename, ps_name); - pango_fc_font_unlock_face (fcfont); + char *file_name_as_ptr = 0; + FcPatternGetString (fcpat, FC_FILE, 0, (FcChar8 **) & file_name_as_ptr); + + std::string file_name; + if (file_name_as_ptr) + { + /* Normalize file name. */ + file_name = File_name (file_name_as_ptr).to_string (); + } + + 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)); + + std::string ps_name; + if (!ps_name_str0 + && file_name != "" + && (file_name.find (".otf") != NPOS + || file_name.find (".cff") != NPOS)) + { + + /* UGH: kludge a PS name for OTF/CFF fonts. */ + std::string name = file_name; + ssize idx = file_name.find (".otf"); + if (idx == NPOS) + 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); + } - SCM expr = scm_list_4 (ly_symbol2scm ("glyph-string"), - scm_makfrom0str (ps_name), - scm_from_double (size), - ly_quote_scm (glyph_exprs)); + std::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) + ps_name = ps_name_str0; + + if (ps_name.length ()) + { + ((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.c_str ()), + scm_from_double (size), + scm_from_bool (cid_keyed), + ly_quote_scm (glyph_exprs)); - Stencil item_stencil (b, expr); + return Stencil (b, expr); + } - return item_stencil; + warning (_ ("FreeType face has no PostScript font name")); + return Stencil (); } +SCM +Pango_font::physical_font_tab () const +{ + return physical_font_tab_; +} Stencil -Pango_font::text_stencil (String str) const +Pango_font::text_stencil (std::string str) const { - GList *items = pango_itemize (context_, - str.to_str0 (), - 0, str.length (), attribute_list_, - NULL); - - GList *ptr = items; + GList *items + = pango_itemize (context_, + str.c_str (), + 0, str.length (), attribute_list_, + NULL); + Stencil dest; - Real x = 0.0; - while (ptr) - { - PangoItem *item = (PangoItem*) ptr->data; - Stencil item_stencil = pango_item_string_stencil (item, str, x); + Real last_x = 0.0; - x = item_stencil.extent (X_AXIS)[RIGHT]; - + 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); + + 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; } - if (output_backend_global != "ps") + /* + UGH. Should have flags per output format signifying supported + options. + */ + if (output_backend_global != "ps" + && output_backend_global != "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 ("utf-8-string"), - scm_makfrom0str (pango_font_description_to_filename (pango_description_)), - scm_makfrom0str (str.to_str0 ())); + scm_makfrom0str (descr_string), + scm_makfrom0str (str.c_str ())); + g_free (descr_string); - return Stencil (dest.extent_box (), - exp); + Box b (Interval (0, 0), Interval (0, 0)); + b.unite (dest.extent_box ()); + return Stencil (b, exp); } - + + return dest; } SCM -Pango_font::sub_fonts () const -{ - return subfonts_; -} - -SCM Pango_font::font_file_name () const { return SCM_BOOL_F; } -LY_DEFINE (ly_pango_font_p, "ly:pango-font?", - 1, 0, 0, - (SCM f), - "Is @var{f} a pango font?") -{ - return scm_from_bool (dynamic_cast (unsmob_metrics (f))); -} - - #endif -