X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=13cf324351f2e5018b50c8c8af524e6340677dc5;hb=635827994d372f4bd0e9c719238380337bae9477;hp=b67c577954ceac377f443636cdd4fa4778f47cb0;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index b67c577954..13cf324351 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--2001 Han-Wen Nienhuys */ #include @@ -11,60 +11,59 @@ #include "staff-symbol-referencer.hh" #include "staff-symbol.hh" #include "paper-def.hh" + +bool +Staff_symbol_referencer::has_interface (Grob*e) +{ + return unsmob_grob (e->get_grob_property ("staff-symbol")) + || gh_number_p (e->get_grob_property ("staff-position")); +} - - - -void -Staff_symbol_referencer::set_interface (Score_element * e) +int +Staff_symbol_referencer::line_count (Grob*me) { - 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); + Grob *st = staff_symbol_l (me); + return st ? Staff_symbol::line_count (st) : 0; } bool -Staff_symbol_referencer::has_interface (Score_element*e) +Staff_symbol_referencer::on_staffline (Grob*me) { - return unsmob_element (e->get_elt_property ("staff-symbol")) - || gh_number_p (e->get_elt_property ("staff-position")); + return on_staffline (me, (int) rint (position_f (me))); } - -int -Staff_symbol_referencer::line_count (Score_element*me) +bool +Staff_symbol_referencer::on_staffline (Grob*me, int pos) { - Score_element *st = staff_symbol_l (me); - return st ? Staff_symbol::line_count (st) : 0; + 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::staff_symbol_l (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 = staff_symbol_l (me); if (st) return Staff_symbol::staff_space (st); - else if (me->pscore_l_ && me->paper_l ()) - return me->paper_l ()->get_var ("interline"); - - return 0.0; + + + return 1.0; } Real -Staff_symbol_referencer::position_f (Score_element*me) +Staff_symbol_referencer::position_f (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 = staff_symbol_l (me); + Grob * c = st ? me->common_refpoint (st, Y_AXIS) : 0; if (st && c) { Real y = me->relative_coordinate (c, Y_AXIS) @@ -74,7 +73,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); } @@ -87,28 +86,30 @@ Staff_symbol_referencer::position_f (Score_element*me) /* 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_elt_property ("staff-position", gh_double2scm (0.0)); + me->set_grob_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 @@ -121,31 +122,51 @@ 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 = staff_symbol_l (me); + if (st && me->common_refpoint (st, Y_AXIS)) { Real oldpos = position_f (me); - me->set_elt_property ("staff-position", gh_double2scm (p - oldpos)); + 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. + */ +Real +Staff_symbol_referencer::staff_radius (Grob*me) +{ + 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) +{ + return sign (Staff_symbol_referencer::position_f ((Grob*)a) - + Staff_symbol_referencer::position_f ((Grob*)b)); +} + + +void +Staff_symbol_referencer::set_interface (Grob * e) { - return sign (Staff_symbol_referencer::position_f((Score_element*)a) - - Staff_symbol_referencer::position_f((Score_element*)b)); + if (!gh_number_p (e->get_grob_property ("staff-position"))) + e->set_grob_property ("staff-position", gh_double2scm (0.0)); + + e->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); } +