X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=85a6806e219ea01106624d837f0ae21e414103d5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4ef9fbe9be622197a5e14afb50b04788d8543193;hpb=46ef5daa401f06c6beeb996a00854e1310501dc1;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 4ef9fbe9be..85a6806e21 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -3,41 +3,43 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2004 Han-Wen Nienhuys + (c) 1999--2008 Han-Wen Nienhuys */ -#include - #include "staff-symbol-referencer.hh" + #include "staff-symbol.hh" +#include "grob.hh" #include "output-def.hh" #include "libc-extension.hh" - int Staff_symbol_referencer::line_count (Grob *me) { - Grob *st = get_staff_symbol (me); - return st ? Staff_symbol::line_count (st) : 0; + Grob *st = get_staff_symbol (me); + return st ? Staff_symbol::line_count (st) : 0; } bool -Staff_symbol_referencer::on_staffline (Grob *me) +Staff_symbol_referencer::on_line (Grob *me, int pos) { - return on_staffline (me, (int) rint (get_position (me))); + Grob *st = get_staff_symbol (me); + return st ? Staff_symbol::on_line (st, pos) : false; } bool -Staff_symbol_referencer::on_staffline (Grob *me, int pos) +Staff_symbol_referencer::on_staff_line (Grob *me, int pos) { - int sz = line_count (me) - 1; - return ((pos + sz) % 2) == 0; + return on_line (me, pos) && abs (pos) <= 2 * staff_radius (me); } -Grob* +Grob * Staff_symbol_referencer::get_staff_symbol (Grob *me) { - SCM st = me->get_property ("staff-symbol"); + if (Staff_symbol::has_interface (me)) + return me; + + SCM st = me->get_object ("staff-symbol"); return unsmob_grob (st); } @@ -56,7 +58,7 @@ Staff_symbol_referencer::line_thickness (Grob *me) Grob *st = get_staff_symbol (me); if (st) return Staff_symbol::get_line_thickness (st); - return me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); + return me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); } Real @@ -73,49 +75,49 @@ Staff_symbol_referencer::get_position (Grob *me) p += 2.0 * y / Staff_symbol::staff_space (st); return p; } - + else if (!st) + return me->relative_coordinate (me->get_parent (Y_AXIS), Y_AXIS) * 2; return robust_scm2double (me->get_property ("staff-position"), p); } -int -Staff_symbol_referencer::get_rounded_position (Grob*me) -{ - return int (rint (get_position (me))); -} -LY_DEFINE (ly_grob_staff_position, "ly:grob-staff-position", - 1, 0,0, (SCM sg), - "Return the Y-position of @var{sg} relative to the staff.") +Interval +Staff_symbol_referencer::extent_in_staff (Grob *me) { - Grob *g = unsmob_grob (sg); + Grob *st = get_staff_symbol (me); + Grob *c = st ? me->common_refpoint (st, Y_AXIS) : 0; - SCM_ASSERT_TYPE (g, sg, SCM_ARG1, __FUNCTION__, "grob"); - Real pos = Staff_symbol_referencer::get_position (g); + Interval retval; + if (st && c) + { + retval = me->extent (c, Y_AXIS) + - st->relative_coordinate (c, Y_AXIS); + } - if (fabs (rint (pos) -pos) < 1e-6) // ugh. - return scm_int2num ((int) my_round (pos)); - else - return scm_make_real (pos); + return retval; } +int +Staff_symbol_referencer::get_rounded_position (Grob *me) +{ + return int (rint (get_position (me))); +} -/* should use offset callback! */ -MAKE_SCHEME_CALLBACK (Staff_symbol_referencer,callback,2); +MAKE_SCHEME_CALLBACK (Staff_symbol_referencer, callback, 1); SCM -Staff_symbol_referencer::callback (SCM element_smob, SCM) +Staff_symbol_referencer::callback (SCM smob) { - Grob *me = unsmob_grob (element_smob); + Grob *me = unsmob_grob (smob); SCM pos = me->get_property ("staff-position"); Real off = 0.0; - if (ly_c_number_p (pos)) + if (scm_is_number (pos)) { Real space = Staff_symbol_referencer::staff_space (me); - off = ly_scm2double (pos) * space / 2.0; - me->set_property ("staff-position", scm_int2num (0)); + off = scm_to_double (pos) * space / 2.0; } - return scm_make_real (off); + return scm_from_double (off); } /* This sets the position relative to the center of the staff symbol. @@ -134,15 +136,15 @@ void Staff_symbol_referencer::set_position (Grob *me, Real p) { Grob *st = get_staff_symbol (me); + Real oldpos = 0.0; if (st && me->common_refpoint (st, Y_AXIS)) { - Real oldpos = get_position (me); - me->set_property ("staff-position", scm_make_real (p - oldpos)); + oldpos = get_position (me); } - else - me->set_property ("staff-position", scm_make_real (p)); - me->add_offset_callback (Staff_symbol_referencer::callback_proc, Y_AXIS); + + Real ss = Staff_symbol_referencer::staff_space (me); + me->translate_axis ((p - oldpos) * ss * 0.5, Y_AXIS); } /* Half of the height, in staff space, i.e. 2.0 for a normal staff. */ @@ -155,15 +157,23 @@ Staff_symbol_referencer::staff_radius (Grob *me) int compare_position (Grob *const &a, Grob *const &b) { - return sign (Staff_symbol_referencer::get_position ((Grob*)a) - - Staff_symbol_referencer::get_position ((Grob*) b)); + return sign (Staff_symbol_referencer::get_position ((Grob *)a) + - Staff_symbol_referencer::get_position ((Grob *) b)); +} + +bool +position_less (Grob *const &a, Grob *const &b) +{ + return Staff_symbol_referencer::get_position (a) + < Staff_symbol_referencer::get_position (b); } -ADD_INTERFACE (Staff_symbol_referencer,"staff-symbol-referencer-interface", - "An object whose Y position is meant relative to a staff " - "symbol. " - "These usually have @code{Staff_symbol_referencer::callback} " - "in their @code{Y-offset-callbacks}. " - , - "staff-position"); +ADD_INTERFACE (Staff_symbol_referencer, + "An object whose Y@tie{}position is meant relative to a staff" + " symbol. These usually" + " have @code{Staff_symbol_referencer::callback} in their" + " @code{Y-offset-callbacks}.", + /* properties */ + "staff-position " + );