X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-signature-interface.cc;h=3249a736c3f2a18c103107bdce08e851b06650b8;hb=e035fded640056dcdf0b202a0156997c2295865e;hp=ad8c3fd0f55420cbfcd49167da0f4e9a181bc7f1;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git diff --git a/lily/key-signature-interface.cc b/lily/key-signature-interface.cc index ad8c3fd0f5..3249a736c3 100644 --- a/lily/key-signature-interface.cc +++ b/lily/key-signature-interface.cc @@ -27,11 +27,11 @@ #include "output-def.hh" #include "staff-symbol-referencer.hh" #include "rational.hh" +#include "lily-imports.hh" struct Key_signature_interface { DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_GROB_INTERFACE (); }; /* @@ -42,7 +42,7 @@ MAKE_SCHEME_CALLBACK (Key_signature_interface, print, 1); SCM Key_signature_interface::print (SCM smob) { - Item *me = dynamic_cast (Grob::unsmob (smob)); + Item *me = unsmob (smob); Real inter = Staff_symbol_referencer::staff_space (me) / 2.0; @@ -87,11 +87,10 @@ Key_signature_interface::print (SCM smob) me->warning (_ ("alteration not found")); else { - SCM proc = ly_lily_module_constant ("key-signature-interface::alteration-positions"); - pos.set_empty (); Stencil column; - for (SCM pos_list = scm_call_3 (proc, scm_car (s), c0s, smob); + for (SCM pos_list = Lily::key_signature_interface_alteration_positions + (scm_car (s), c0s, smob); scm_is_pair (pos_list); pos_list = scm_cdr (pos_list)) { int p = scm_to_int (scm_car (pos_list));