X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-interface.cc;h=a85bd4db7414c3ebd450cd597dfd9d63c5888d01;hb=feef5e0d897345a88595671e0f54e1127a20d09f;hp=0694a85ef88b4258df2cd3b7916fe63c61376104;hpb=adf6098d9af0da439e92fc1aa2cb0aa50e59d922;p=lilypond.git diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 0694a85ef8..a85bd4db74 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -1,11 +1,10 @@ -/* +/* font-interface.cc -- implement Font_interface source file of the GNU LilyPond music typesetter - - (c) 2000--2002 Han-Wen Nienhuys - - */ + + (c) 2000--2004 Han-Wen Nienhuys +*/ #include "all-font-metrics.hh" #include "font-metric.hh" @@ -15,231 +14,44 @@ #include "warn.hh" -/* - TODO revise font handling. - - -* relative sizes should relate to staff-space, eg. font-staff-space -= 1.2 ^ relative-size - -* If a relative size is given, lily should magnify the closest -design size font to match that. (ie. fonts should have variable -scaling) - -(this requires that fonts are stored as (filename , designsize)) - - - - */ - -SCM -Font_interface::font_alist_chain (Grob *me) -{ - /* - Ugh: why the defaults? - */ - SCM defaults = me->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults")); - - SCM ch = me->get_property_alist_chain (defaults); - return ch; -} - -/* - todo: split up this func, reuse in text_item? - */ -Font_metric * -Font_interface::get_default_font (Grob*me) -{ - Font_metric * fm = unsmob_metrics (me->get_grob_property ("font")); - if (fm) - return fm; - - fm = get_font (me, font_alist_chain (me)); - me->set_grob_property ("font", fm->self_scm ()); - return fm; -} - - -LY_DEFINE(ly_font_interface_get_default_font, - "ly-get-default-font", 1 , 0, 0, - (SCM grob), "Return the default font for grob @var{gr}.") -{ - Grob * gr = unsmob_grob (grob); - SCM_ASSERT_TYPE(gr, grob, SCM_ARG1, __FUNCTION__, "grob"); - - return Font_interface::get_default_font (gr)->self_scm (); -} - -LY_DEFINE(ly_font_interface_get_font,"ly-get-font", 2, 0, 0, - (SCM grob, SCM alist), - "Return a font metric satisfying the font-qualifiers in @var{alist}. - - -The font object represents the metric information of a font. Every font -that is loaded into LilyPond can be accessed via Scheme. - -LilyPond only needs to know the dimension of glyph to be able to process -them. This information is stored in font metric files. LilyPond can read -two types of font-metrics: @TeX{} Font Metric files (TFM files) and -Adobe Font Metric files (AFM files). LilyPond will always try to load -AFM files first since they are more versatile. - -") -{ - Grob * gr = unsmob_grob (grob); - SCM_ASSERT_TYPE(gr, grob, SCM_ARG1, __FUNCTION__, "grob"); - - Font_metric*fm= - Font_interface::get_font (gr, gh_cons (alist, - Font_interface::font_alist_chain (gr))); - - return fm->self_scm(); -} - - - +/* todo: split up this func, reuse in text_item? */ Font_metric * -Font_interface::get_font (Grob *me, SCM chain) +Font_interface::get_default_font (Grob *me) { - SCM name = me->get_grob_property ("font-name"); - - if (!gh_string_p (name)) + Font_metric *fm = unsmob_metrics (me->get_property ("font")); + if (!fm) { - Paper_def * p = me->get_paper (); - - SCM proc = p->lookup_variable (ly_symbol2scm ("properties-to-font")); - SCM fonts = p->lookup_variable (ly_symbol2scm ("fonts")); - assert (gh_procedure_p (proc)); - name = gh_call2 (proc, fonts, chain); + SCM defaults = me->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults")); + SCM chain = me->get_property_alist_chain (defaults); + + fm = select_font (me->get_paper (), chain); + me->set_property ("font", fm->self_scm ()); } - SCM mag = me->get_grob_property ("font-magnification"); - Real rmag = gh_number_p (mag) ? gh_scm2double (mag) : 1.0; - - Font_metric *fm = me->get_paper ()->find_font (name, rmag); return fm; } -SCM -Font_interface::add_style (Grob* me, SCM style, SCM chain) +LY_DEFINE (ly_font_interface_get_default_font, "ly:get-default-font", + 1 , 0, 0, (SCM grob), + "Return the default font for grob @var{gr}.") { - assert (gh_symbol_p (style)); - - SCM style_alist = me->get_paper ()->lookup_variable (ly_symbol2scm ("style-alist")); - SCM entry = scm_assoc (style, style_alist); - if (gh_pair_p (entry)) - { - chain = gh_cons (ly_cdr (entry), chain); - } - return chain; -} - -/* -SCM routines: + Grob *gr = unsmob_grob (grob); + SCM_ASSERT_TYPE (gr, grob, SCM_ARG1, __FUNCTION__, "grob"); -Interpreting music... -MIDI output to wtk1-fugue2.midi... -Track ... - -real 0m31.862s -user 0m29.110s -sys 0m0.260s - -real 0m26.964s -user 0m24.850s -sys 0m0.280s - - -so a 14% speedup. - -*/ - -static SCM shape_sym, family_sym, series_sym, rel_str0_sym, design_str0_sym, wild_sym; - - -static void -init_syms () -{ - shape_sym = scm_permanent_object (ly_symbol2scm ("font-shape")); - family_sym = scm_permanent_object (ly_symbol2scm ("font-family")); - series_sym = scm_permanent_object (ly_symbol2scm ("font-series")); - rel_str0_sym = scm_permanent_object (ly_symbol2scm ("font-relative-size")); - design_str0_sym = scm_permanent_object (ly_symbol2scm ("font-design-size")); - wild_sym = scm_permanent_object (ly_symbol2scm ("*")); -} - -ADD_SCM_INIT_FUNC(fi_init_syms, init_syms); - -bool -Font_interface::wild_compare (SCM field_val, SCM val) -{ - return (val == SCM_BOOL_F || field_val == wild_sym || field_val == val); + return Font_interface::get_default_font (gr)->self_scm (); } -MAKE_SCHEME_CALLBACK (Font_interface,properties_to_font_name,2); SCM -Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain) +Font_interface::text_font_alist_chain (Grob *g) { - SCM shape = SCM_BOOL_F; - SCM family = SCM_BOOL_F; - SCM series = SCM_BOOL_F; - - - SCM point_str0 = ly_assoc_chain (design_str0_sym, alist_chain); - SCM rel_str0 = SCM_BOOL_F; - - shape = ly_assoc_chain (shape_sym, alist_chain); - family = ly_assoc_chain (family_sym, alist_chain); - series = ly_assoc_chain (series_sym, alist_chain); - - if (gh_pair_p (shape)) - shape = ly_cdr (shape); - if (gh_pair_p (family)) - family = ly_cdr (family); - if (gh_pair_p (series)) - series = ly_cdr (series); - - - if (gh_pair_p (point_str0)) - point_str0 = ly_cdr (point_str0); - else - { - rel_str0 = ly_assoc_chain (rel_str0_sym, alist_chain); - if (gh_pair_p (rel_str0)) - rel_str0 = ly_cdr (rel_str0); - } - - for (SCM s = fonts ; gh_pair_p (s); s = ly_cdr (s)) - { - SCM qlist = ly_caar (s); - - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (1)), series)) - continue; - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (2)), shape)) - continue; - if (!wild_compare (scm_list_ref (qlist, gh_int2scm (3)), family)) - continue; - - if (point_str0 == SCM_BOOL_F && !wild_compare (ly_car (qlist), rel_str0)) - continue; - - SCM qname = ly_cdar (s); - return qname; - } - - warning (_ ("couldn't find any font satisfying ")); - scm_write (scm_list_n (point_str0, shape, series , family, rel_str0, - SCM_UNDEFINED), scm_current_error_port ()); - scm_flush (scm_current_error_port ()); - - return scm_makfrom0str ("cmr10"); - + SCM defaults = g->get_paper ()->lookup_variable (ly_symbol2scm ("text-font-defaults")); + return g->get_property_alist_chain (defaults); } - - ADD_INTERFACE (Font_interface, "font-interface", - "Any symbol that is typeset through fixed sets of glyphs (ie. fonts)", - "font-magnification font-style font font-series font-shape font-family font-name font-design-size font-relative-size"); + "Any symbol that is typeset through fixed sets of glyphs, " + " (ie. fonts)", + "font-magnification font font-series font-shape " + "font-family font-encoding font-name font-size");