X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=0ed60e616ba16f9e7f2f26f3f5a7a3615541dad5;hb=2750f4bd4ed25ade9a849e08b1c087229c40b44e;hp=4e70b158b6b58d2e1611076e5a5c25a4ebc080a8;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 4e70b158b6..0ed60e616b 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2003 Han-Wen Nienhuys */ #include @@ -11,73 +11,52 @@ #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "paper-def.hh" - - - - -void -Staff_symbol_referencer::set_interface (Score_element * e) -{ - if (!gh_number_p (e->get_elt_property ("staff-position"))) - e->set_elt_property ("staff-position", gh_double2scm (0.0)); - - e->add_offset_callback (callback, Y_AXIS); -} - -bool -Staff_symbol_referencer::has_interface (Score_element*e) -{ - return unsmob_element (e->get_elt_property ("staff-symbol")) - || gh_number_p (e->get_elt_property ("staff-position")); -} + int -Staff_symbol_referencer::line_count (Score_element*me) +Staff_symbol_referencer::line_count (Grob*me) { - Score_element *st = staff_symbol_l (me); + Grob *st = get_staff_symbol (me); return st ? Staff_symbol::line_count (st) : 0; } bool -Staff_symbol_referencer::on_staffline (Score_element*me) +Staff_symbol_referencer::on_staffline (Grob*me) { - return on_staffline (me, (int) position_f (me)); + return on_staffline (me, (int) rint (get_position (me))); } bool -Staff_symbol_referencer::on_staffline (Score_element*me, int pos) +Staff_symbol_referencer::on_staffline (Grob*me, int pos) { int sz = line_count (me)-1; return ((pos + sz) % 2) == 0; } -Score_element* -Staff_symbol_referencer::staff_symbol_l (Score_element*me) +Grob* +Staff_symbol_referencer::get_staff_symbol (Grob*me) { - SCM st = me->get_elt_property ("staff-symbol"); - return unsmob_element(st); + SCM st = me->get_grob_property ("staff-symbol"); + return unsmob_grob (st); } Real -Staff_symbol_referencer::staff_space (Score_element*me) +Staff_symbol_referencer::staff_space (Grob*me) { - Score_element * st = staff_symbol_l (me); + Grob * st = get_staff_symbol (me); if (st) return Staff_symbol::staff_space (st); - else if (me->pscore_l_ && me->paper_l ()) - return me->paper_l ()->get_var ("staffspace"); - - return 0.0; -} + return 1.0; +} Real -Staff_symbol_referencer::position_f (Score_element*me) +Staff_symbol_referencer::get_position (Grob*me) { Real p =0.0; - Score_element * st = staff_symbol_l (me); - Score_element * c = st ? me->common_refpoint (st, Y_AXIS) : 0; + Grob * st = get_staff_symbol (me); + Grob * c = st ? me->common_refpoint (st, Y_AXIS) : 0; if (st && c) { Real y = me->relative_coordinate (c, Y_AXIS) @@ -87,7 +66,7 @@ Staff_symbol_referencer::position_f (Score_element*me) } else { - SCM pos = me->get_elt_property ("staff-position"); + SCM pos = me->get_grob_property ("staff-position"); if (gh_number_p (pos)) return gh_scm2double (pos); } @@ -96,32 +75,49 @@ Staff_symbol_referencer::position_f (Score_element*me) } +LY_DEFINE(ly_grob_staff_position, + "ly:grob-staff-position", + 1, 0,0, (SCM sg), + "Return the Y-position of this grob relative to the staff.") +{ + Grob * g = unsmob_grob (sg); + + SCM_ASSERT_TYPE (g, sg, SCM_ARG1, __FUNCTION__, "grob"); + Real pos = Staff_symbol_referencer::get_position (g); + + if (fabs (rint (pos) -pos) < 1e-6) // ugh. + return gh_int2scm (lrint (pos)); + else + return gh_double2scm (pos); +} + /* should use offset callback! */ -Real -Staff_symbol_referencer::callback (Score_element * sc,Axis ) +MAKE_SCHEME_CALLBACK (Staff_symbol_referencer,callback,2); +SCM +Staff_symbol_referencer::callback (SCM element_smob, SCM) { - Score_element* me = (Score_element*)sc; // UGH. + Grob *me = unsmob_grob (element_smob); + - SCM pos = sc->get_elt_property ("staff-position"); + SCM pos = me->get_grob_property ("staff-position"); Real off =0.0; if (gh_number_p (pos)) { - Real space = Staff_symbol_referencer::staff_space (sc); + Real space = Staff_symbol_referencer::staff_space (me); off = gh_scm2double (pos) * space/2.0; + me->set_grob_property ("staff-position", gh_int2scm (0)); } - me->set_elt_property ("staff-position", gh_double2scm (0.0)); - - return off; + return gh_double2scm (off); } -/* + /* This sets the position relative to the center of the staff symbol. - + The function is hairy, because it can be callled in two situations: 1. There is no staff yet; we must set staff-position @@ -134,40 +130,47 @@ Staff_symbol_referencer::callback (Score_element * sc,Axis ) */ void -Staff_symbol_referencer::set_position (Score_element*me,Real p) +Staff_symbol_referencer::set_position (Grob*me,Real p) { - Score_element * st = staff_symbol_l (me); - if (st && me->common_refpoint(st, Y_AXIS)) + Grob * st = get_staff_symbol (me); + if (st && me->common_refpoint (st, Y_AXIS)) { - Real oldpos = position_f (me); - me->set_elt_property ("staff-position", gh_double2scm (p - oldpos)); + Real oldpos = get_position (me); + me->set_grob_property ("staff-position", gh_double2scm (p - oldpos)); } else { - me->set_elt_property ("staff-position", - gh_double2scm (p)); + me->set_grob_property ("staff-position", + gh_double2scm (p)); } - if (me->has_offset_callback_b (callback, Y_AXIS)) + if (me->has_offset_callback_b (Staff_symbol_referencer::callback_proc, Y_AXIS)) return ; - me->add_offset_callback (callback, Y_AXIS); + me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); } /* - half of the height, in staff space. - */ + Half of the height, in staff space, i.e. 2.0 for a normal staff. +*/ Real -Staff_symbol_referencer::staff_radius (Score_element*me) +Staff_symbol_referencer::staff_radius (Grob*me) { - return (line_count (me) -1) / 2; + return (line_count (me) -1) / 2.0; } int -compare_position (Score_element *const &a, Score_element * const &b) +compare_position (Grob *const &a, Grob * const &b) { - return sign (Staff_symbol_referencer::position_f((Score_element*)a) - - Staff_symbol_referencer::position_f((Score_element*)b)); + return sign (Staff_symbol_referencer::get_position ((Grob*)a) - + Staff_symbol_referencer::get_position ((Grob*)b)); } + +ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface", + "Object whose Y position is meaning with reference to a staff " +"symbol. Objects that have this interface should include " +"Staff_symbol_referencer::callback in their Y-offset-callback. " +, + "staff-position");