X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol-referencer.cc;h=3b8aa6ba187698bb8ea6a92f1580c3069c9f787e;hb=09f7d25964ec1ae3ad1f4a862a2b46444f56c50f;hp=b18bb04fa3b8f7f2dd6b8d60206e09ac2fb08863;hpb=743f0d4b067e76d591487f085240a7ff9ace85a7;p=lilypond.git diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index b18bb04fa3..3b8aa6ba18 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -189,11 +189,23 @@ Staff_symbol_referencer::internal_set_position (Grob *me, Real p, bool pure) 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. */ +Interval +Staff_symbol_referencer::staff_span (Grob *me) +{ + Interval result; + if (me) + if (Grob *symb = get_staff_symbol (me)) + result = Staff_symbol::line_span (symb); + return result; +} + Real Staff_symbol_referencer::staff_radius (Grob *me) { - return (line_count (me) - 1) / 2.0; + /* + line_span is measured in pitch steps, not in staff spaces + */ + return staff_span (me).length () / 4.0; } int