X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=dec5000b2a944e299345ba9c74321544de2bfeff;hb=3f730e9e528ad05611c80a856341569c99082b26;hp=64522e734f59e6371b1c486acf3b2b132be39445;hpb=cc288cebe296287d2f99c517869f96c646677f37;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 64522e734f..dec5000b2a 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 Han-Wen Nienhuys + (c) 1999--2003 Han-Wen Nienhuys */ #include @@ -11,72 +11,62 @@ #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "paper-def.hh" -#include "dimension-cache.hh" +#include "libc-extension.hh" -Staff_symbol_referencer_interface::Staff_symbol_referencer_interface (Score_element const *sc) -{ - elt_l_ = (Score_element*)sc; -} -void -Staff_symbol_referencer_interface::set_interface () +int +Staff_symbol_referencer::line_count (Grob*me) { - elt_l_->set_elt_property ("staff-position", gh_double2scm (0.0)); - elt_l_->dim_cache_[Y_AXIS]->off_callbacks_.push (callback); + Grob *st = get_staff_symbol (me); + return st ? Staff_symbol::line_count (st) : 0; } - bool -Staff_symbol_referencer_interface::has_interface_b () +Staff_symbol_referencer::on_staffline (Grob*me) { - return unsmob_element (elt_l_->get_elt_property ("staff-symbol")) - || gh_number_p (elt_l_->get_elt_property ("staff-position")); + return on_staffline (me, (int) rint (get_position (me))); } - -int -Staff_symbol_referencer_interface::line_count () const +bool +Staff_symbol_referencer::on_staffline (Grob*me, int pos) { - Staff_symbol *st = staff_symbol_l (); - return st ? st->line_count () : 0; + int sz = line_count (me)-1; + return ((pos + sz) % 2) == 0; } -Staff_symbol* -Staff_symbol_referencer_interface::staff_symbol_l () const +Grob* +Staff_symbol_referencer::get_staff_symbol (Grob*me) { - SCM st = elt_l_->get_elt_property ("staff-symbol"); - return dynamic_cast (unsmob_element(st)); + SCM st = me->get_grob_property ("staff-symbol"); + return unsmob_grob (st); } Real -Staff_symbol_referencer_interface::staff_space () const +Staff_symbol_referencer::staff_space (Grob*me) { - Staff_symbol * st = staff_symbol_l (); + Grob * st = get_staff_symbol (me); if (st) - return st->staff_space (); - else if (elt_l_->pscore_l_ && elt_l_->paper_l ()) - return elt_l_->paper_l ()->get_var ("interline"); - - return 0.0; -} + return Staff_symbol::staff_space (st); + return 1.0; +} Real -Staff_symbol_referencer_interface::position_f () const +Staff_symbol_referencer::get_position (Grob*me) { Real p =0.0; - Staff_symbol * st = staff_symbol_l (); - Score_element * c = st ? elt_l_->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 = elt_l_->relative_coordinate (c, Y_AXIS) + Real y = me->relative_coordinate (c, Y_AXIS) - st->relative_coordinate (c, Y_AXIS); - p += 2.0 * y / st->staff_space (); + p += 2.0 * y / Staff_symbol::staff_space (st); } else { - SCM pos = elt_l_->get_elt_property ("staff-position"); + SCM pos = me->get_grob_property ("staff-position"); if (gh_number_p (pos)) return gh_scm2double (pos); } @@ -85,64 +75,102 @@ Staff_symbol_referencer_interface::position_f () const } +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 ((int) my_round (pos)); + else + return gh_double2scm (pos); +} + /* should use offset callback! */ -Real -Staff_symbol_referencer_interface::callback (Dimension_cache const * c) +MAKE_SCHEME_CALLBACK (Staff_symbol_referencer,callback,2); +SCM +Staff_symbol_referencer::callback (SCM element_smob, SCM) { - Score_element * sc = dynamic_cast (c->element_l ()); + 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 (sc).staff_space (); + Real space = Staff_symbol_referencer::staff_space (me); off = gh_scm2double (pos) * space/2.0; + me->set_grob_property ("staff-position", gh_int2scm (0)); } - sc->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 + 2. There is a staff, and perhaps someone even applied a + translate_axis (). Then we must compensate for the translation + + In either case, we set a callback to be sure that our new position + will be extracted from staff-position + + */ void -Staff_symbol_referencer_interface::set_position (Real p) +Staff_symbol_referencer::set_position (Grob*me,Real p) { - Staff_symbol * st = staff_symbol_l (); - if (st && elt_l_->common_refpoint(st, Y_AXIS)) + Grob * st = get_staff_symbol (me); + if (st && me->common_refpoint (st, Y_AXIS)) { - Real oldpos = position_f (); - elt_l_->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 { - elt_l_->set_elt_property ("staff-position", - gh_double2scm (p)); + me->set_grob_property ("staff-position", + gh_double2scm (p)); } - Array &callbacks (elt_l_->dim_cache_[Y_AXIS]->off_callbacks_); - for (int i=0; i < callbacks.size ();i++) - if (callbacks[i] == callback) - return ; + if (me->has_offset_callback_b (Staff_symbol_referencer::callback_proc, Y_AXIS)) + return ; - callbacks.push (callback); + me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); } -Staff_symbol_referencer_interface -staff_symbol_referencer (Score_element const*e) +/* + Half of the height, in staff space, i.e. 2.0 for a normal staff. +*/ +Real +Staff_symbol_referencer::staff_radius (Grob*me) { - return e; // gee, I'm so smart! + 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) { - Staff_symbol_referencer_interface s1(a); - Staff_symbol_referencer_interface s2(b); - - return sign(s1.position_f () - s2.position_f ()); + 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");