X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=2d05d1f11a7f975c641c64bce0c525ca6e928284;hb=f9efd2c54b174591fa42889557686c7aea356547;hp=ba6d15a7d8b75a838164a87960442bcf0c85be49;hpb=0349917b7d91f01c8e5a3461185c850820e51710;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index ba6d15a7d8..2d05d1f11a 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--2002 Han-Wen Nienhuys */ #include @@ -11,73 +11,67 @@ #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "paper-def.hh" -#include "dimension-cache.hh" - -Staff_symbol_referencer_interface::Staff_symbol_referencer_interface (Score_element const *sc) + +bool +Staff_symbol_referencer::has_interface (Grob*e) { - elt_l_ = (Score_element*)sc; + return unsmob_grob (e->get_grob_property ("staff-symbol")) + || gh_number_p (e->get_grob_property ("staff-position")); } -void -Staff_symbol_referencer_interface::set_interface () +int +Staff_symbol_referencer::line_count (Grob*me) { - if (!gh_number_p (elt_l_->get_elt_property ("staff-position"))) - elt_l_->set_elt_property ("staff-position", gh_double2scm (0.0)); - - elt_l_->add_offset_callback (callback, Y_AXIS); + Grob *st = staff_symbol_l (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_pointer ("staff-symbol")) - || gh_number_p (elt_l_->get_elt_property ("staff-position")); + return on_staffline (me, (int) rint (position_f (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::staff_symbol_l (Grob*me) { - SCM st = elt_l_->get_elt_pointer ("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 = staff_symbol_l (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::position_f (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 = staff_symbol_l (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); } @@ -90,28 +84,29 @@ Staff_symbol_referencer_interface::position_f () const /* should use offset callback! */ -Real -Staff_symbol_referencer_interface::callback (Score_element const* 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 (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_double2scm (0.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 @@ -124,38 +119,51 @@ Staff_symbol_referencer_interface::callback (Score_element const* sc,Axis ) */ 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 = staff_symbol_l (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 = position_f (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)); } - if (elt_l_->has_offset_callback_b (callback, Y_AXIS)) + if (me->has_offset_callback_b (Staff_symbol_referencer::callback_proc, Y_AXIS)) return ; - elt_l_->add_offset_callback (callback, Y_AXIS); + 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. + */ +Real +Staff_symbol_referencer::staff_radius (Grob*me) { - return e; // gee, I'm so smart! + return (line_count (me) -1) / 2; } + 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::position_f ((Grob*)a) - + Staff_symbol_referencer::position_f ((Grob*)b)); } + + + + +#define has_interface ugly_hack +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");