X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpango-font.cc;h=0a4fc747fa98fb0953a15f988210a4e45005583b;hb=b4d2043223a86826764bc531e684a864c97605fe;hp=8ff54d23ab7f808b035f1f0f9865b1750728829a;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 8ff54d23ab..0a4fc747fa 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -1,51 +1,54 @@ /* - pango-font.cc -- implement Pango_font + pango-font.cc -- implement Pango_font source file of the GNU LilyPond music typesetter (c) 2004--2005 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 "lookup.hh" +#include "main.hh" +#include "warn.hh" +#if HAVE_PANGO_FT2 +#include "stencil.hh" Pango_font::Pango_font (PangoFT2FontMap *fontmap, Direction dir, PangoFontDescription *description, Real output_scale) { - subfonts_ = SCM_EOL; + (void) fontmap; + physical_font_tab_ = scm_c_make_hash_table (11); PangoDirection pango_dir = (dir == RIGHT) ? PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL; - context_ = - pango_ft2_get_context (PANGO_RESOLUTION, PANGO_RESOLUTION); + 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 * output_scale) --hwn - */ + */ 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); @@ -59,21 +62,22 @@ 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) { - subfonts_ = scm_cons (scm_makfrom0str (filename.to_str0 ()), - subfonts_); + scm_hash_set_x (physical_font_tab_, + scm_makfrom0str (ps_name.to_str0 ()), + scm_makfrom0str (filename.to_str0 ())); } 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 -{ +{ const int GLYPH_NAME_LEN = 256; char glyph_name[GLYPH_NAME_LEN]; PangoAnalysis *pa = &(item->analysis); @@ -85,32 +89,48 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con 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(ink_rect), - PANGO_RBEARING(ink_rect)), - Interval (-PANGO_DESCENT(ink_rect), - PANGO_ASCENT(ink_rect))); - - b.scale (scale_); + 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_3 (scm_from_double (ggeo.x_offset * scale_ + + dx), scm_from_double (ggeo.y_offset * scale_), - scm_makfrom0str (glyph_name)), + char_id), SCM_EOL); dx = 0.0; tail = SCM_CDRLOC (*tail); @@ -118,25 +138,72 @@ Pango_font::pango_item_string_stencil (PangoItem *item, String str, Real dx) con 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); - - SCM expr = scm_list_4 (ly_symbol2scm ("glyph-string"), - scm_makfrom0str (ps_name), - scm_from_double (size), - ly_quote_scm (glyph_exprs)); - - Stencil item_stencil (b, expr); - - return item_stencil; + 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; + if (!ps_name_str0 + && file_name + && (String (file_name).index (".otf") >= 0 + || String (file_name).index (".cff") >= 0)) + { + + /* 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")); + + name = name.left_string (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 (); + 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.to_str0 ()), + scm_from_double (size), + scm_from_bool (cid_keyed), + ly_quote_scm (glyph_exprs)); + + return Stencil (b, expr); + } + + 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 @@ -145,49 +212,53 @@ Pango_font::text_stencil (String str) const str.to_str0 (), 0, str.length (), attribute_list_, NULL); - + GList *ptr = items; Stencil dest; Real x = 0.0; while (ptr) { - PangoItem *item = (PangoItem*) ptr->data; + PangoItem *item = (PangoItem *) ptr->data; Stencil item_stencil = pango_item_string_stencil (item, str, x); x = item_stencil.extent (X_AXIS)[RIGHT]; - + dest.add_stencil (item_stencil); - - ptr = ptr->next; + + ptr = ptr->next; } /* 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 ("utf8-string"), - scm_makfrom0str (pango_font_description_to_string (pango_description_)), + = scm_list_3 (ly_symbol2scm ("utf-8-string"), + scm_makfrom0str (descr_string), scm_makfrom0str (str.to_str0 ())); + g_free (descr_string); Box b (Interval (0, 0), Interval (0, 0)); b.unite (dest.extent_box ()); return Stencil (b, exp); } - -#if 0 - // check extents. + +#if 0 /* Check extents. */ if (!dest.extent_box ()[X_AXIS].is_empty ()) { - Stencil frame = Lookup::frame (dest.extent_box(), 0.1, 0.1); + 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 @@ -196,25 +267,9 @@ Pango_font::text_stencil (String str) const } 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 -