X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=f5ac177149e8d50e5d2dd1b5643600cee56dddf8;hb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;hp=2939e0c0614fdb035fe5a62409c4708f7bbf03ee;hpb=1c72394c0ae30ba289f869059ec2532eac8d4015;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 2939e0c061..f5ac177149 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -81,7 +81,7 @@ Staff_symbol_referencer::get_position (Grob *me) if (st && c) { Real y = me->relative_coordinate (c, Y_AXIS) - - st->relative_coordinate (c, Y_AXIS); + - st->relative_coordinate (c, Y_AXIS); Real space = Staff_symbol::staff_space (st); p = (space == 0) ? 0 : 2.0 * y / space; return p; @@ -91,7 +91,6 @@ Staff_symbol_referencer::get_position (Grob *me) return robust_scm2double (me->get_property ("staff-position"), p); } - Interval Staff_symbol_referencer::extent_in_staff (Grob *me) { @@ -101,8 +100,8 @@ Staff_symbol_referencer::extent_in_staff (Grob *me) Interval retval; if (st && c) { - retval = me->extent (c, Y_AXIS) - - st->relative_coordinate (c, Y_AXIS); + retval = me->extent (c, Y_AXIS) + - st->relative_coordinate (c, Y_AXIS); } return retval; @@ -154,7 +153,7 @@ Staff_symbol_referencer::set_position (Grob *me, Real p) } Real ss = Staff_symbol_referencer::staff_space (me); - me->translate_axis ((p - oldpos) * ss * 0.5, Y_AXIS); + 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. */ @@ -168,22 +167,22 @@ 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)); + - 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); + < Staff_symbol_referencer::get_position (b); } 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 " - ); + "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 " + );