From fcbab08119ec470a144fcaaa44d5ee5c3b0ffb00 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 02:06:06 +0000 Subject: [PATCH] lilypond-1.5.35 --- lily/font-interface.cc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lily/font-interface.cc b/lily/font-interface.cc index d0e23e9bc0..c0f7757823 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -35,6 +35,9 @@ scaling) SCM Font_interface::font_alist_chain (Grob *me) { + /* + Ugh: why the defaults? + */ SCM defaults = ly_cdr (scm_assoc (ly_symbol2scm ("font-defaults"), me->paper_l ()->style_sheet_)); @@ -76,6 +79,20 @@ ly_font_interface_get_default_font (SCM grob) return Font_interface::get_default_font (gr)->self_scm (); } +SCM +ly_font_interface_get_font (SCM grob, SCM alist) +{ + 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(); +} + + Font_metric * Font_interface::get_font (Grob *me, SCM chain) @@ -153,6 +170,8 @@ init_syms () scm_c_define_gsubr ("ly-get-default-font", 1 , 0, 0, (Scheme_function_unknown) ly_font_interface_get_default_font); + scm_c_define_gsubr ("ly-get-font", 2, 0, 0, + (Scheme_function_unknown) ly_font_interface_get_font); } -- 2.39.5