X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=998813a0ec7199d93d284dbe4236a9ebd6d3664e;hb=3312ca325600af8adf1fbad1a9546aa1566fab66;hp=026a3286c55e9fae2c8d275aa5fb089dc1072c34;hpb=2e27ed5376347ffad9b677d3c013d59766074968;p=lilypond.git diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 026a3286c5..998813a0ec 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -54,15 +54,6 @@ Side_position_interface::add_support (Grob *me, Grob *e) Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("side-support-elements"), e); } -void -Side_position_interface::recursive_add_support (Grob *me, Grob *e) -{ - Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("side-support-elements"), e); - extract_grob_set (e, "side-support-elements", sse); - for (vsize i = 0; i < sse.size (); i++) - recursive_add_support (me, sse[i]); -} - set get_support_set (Grob *me) { @@ -149,29 +140,32 @@ Side_position_interface::calc_cross_staff (SCM smob) { Grob *me = unsmob_grob (smob); extract_grob_set (me, "side-support-elements", elts); -// Commented out because of cross staff issues -// Direction for cross staff stems depends on the spacing of staves, -// which depends on the inclusion of cross-staff side position grobs, -// which need the direction for positioning. So the get_grob_direction call -// may lead to circular dependencies. -// #if 0 + Direction my_dir = get_grob_direction (me) ; - // if a cross-staff grob is pointing in a different direction than - // that of an aligning element, we assume that the alignment - // of said element will not be influenced the cross-staffitude - // of the grob and thus we do not mark the aligning element - // as cross-staff for (vsize i = 0; i < elts.size (); i++) - if (to_boolean (elts[i]->get_property ("cross-staff")) - && my_dir == get_grob_direction (elts[i])) - return SCM_BOOL_T; -//#endif -#if 0 - for (vsize i = 0; i < elts.size (); i++) - if (to_boolean (elts[i]->get_property ("cross-staff"))) - return SCM_BOOL_T; -#endif + { + /* + If 'me' is placed relative to any cross-staff element with a + 'direction callback defined, the placement of 'me' is likely + to depend on staff-spacing, thus 'me' should be considered + cross-staff. + */ + if (to_boolean (elts[i]->get_property ("cross-staff")) + && !is_direction (elts[i]->get_property_data ("direction"))) + return SCM_BOOL_T; + + /* + If elts[i] is cross-staff and is pointing in the same + direction as 'me', we assume that the alignment + of 'me' is influenced the cross-staffitude of elts[i] + and thus we mark 'me' as cross-staff. + */ + if (to_boolean (elts[i]->get_property ("cross-staff")) + && my_dir == get_grob_direction (elts[i])) + return SCM_BOOL_T; + } + Grob *myvag = Grob::get_vertical_axis_group (me); for (vsize i = 0; i < elts.size (); i++) if (myvag != Grob::get_vertical_axis_group (elts[i])) @@ -200,6 +194,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me); bool quantize_position = to_boolean (me->get_maybe_pure_property ("quantize-position", pure, start, end)); + bool me_cross_staff = to_boolean (me->get_property ("cross-staff")); bool include_staff = staff_symbol @@ -211,14 +206,13 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i common[Y_AXIS] = staff_symbol->common_refpoint (common[Y_AXIS], Y_AXIS); Skyline my_dim; - Skyline_pair *skyp = Skyline_pair::unsmob ( - me->get_maybe_pure_property (a == X_AXIS - ? "horizontal-skylines" - : "vertical-skylines", - pure, - start, - end)); - if (skyp) + SCM skyp = me->get_maybe_pure_property (a == X_AXIS + ? "horizontal-skylines" + : "vertical-skylines", + pure, + start, + end); + if (Skyline_pair::unsmob (skyp)) { // for spanner pure heights, we don't know horizontal spacing, // so a spanner can never have a meaningful x coordiante @@ -234,7 +228,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i Real yc = a == X_AXIS ? me->pure_relative_y_coordinate (common[Y_AXIS], start, end) : me->get_parent (Y_AXIS)->maybe_pure_coordinate (common[Y_AXIS], Y_AXIS, pure, start, end); - Skyline_pair copy = Skyline_pair (*skyp); + Skyline_pair copy = *Skyline_pair::unsmob (skyp); copy.shift (a == X_AXIS ? yc : xc); copy.raise (a == X_AXIS ? xc : yc); my_dim = copy[-dir]; @@ -253,29 +247,34 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i { Grob *e = *it; - // In the case of a stem, we will find a note head as well - // ignoring the stem solves cyclic dependencies if the stem is - // attached to a cross-staff beam. + bool cross_staff = to_boolean (e->get_property ("cross-staff")); if (a == Y_AXIS - && Stem::has_interface (e) - && dir == - get_grob_direction (e)) - continue; + && !me_cross_staff // 'me' promised not to adapt to staff-spacing + && cross_staff) // but 'e' might move based on staff-pacing + continue; // so 'me' may not move in response to 'e' - if (e) + if (a == Y_AXIS + && Stem::has_interface (e)) { + // If called as 'pure' we may not force a stem to set its direction, + if (pure && !is_direction (e->get_property_data ("direction"))) + continue; + // There is no need to consider stems pointing away. + if (dir == -get_grob_direction (e)) + continue; + } - bool cross_staff = to_boolean (e->get_property ("cross-staff")); - - Skyline_pair *sp = Skyline_pair::unsmob - (e->get_maybe_pure_property (a == X_AXIS - ? "horizontal-skylines" - : "vertical-skylines", - pure || cross_staff, - start, - end)); + if (e) + { + SCM sp = e->get_maybe_pure_property (a == X_AXIS + ? "horizontal-skylines" + : "vertical-skylines", + pure, + start, + end); aligns_to_cross_staff |= cross_staff; - if (sp) + if (Skyline_pair::unsmob (sp)) { Real xc = pure && dynamic_cast (e) ? e->get_parent (X_AXIS)->relative_coordinate (common[X_AXIS], X_AXIS) @@ -285,7 +284,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i Real yc = a == X_AXIS ? e->pure_relative_y_coordinate (common[Y_AXIS], start, end) : e->maybe_pure_coordinate (common[Y_AXIS], Y_AXIS, pure, start, end); - Skyline_pair copy = Skyline_pair (*sp); + Skyline_pair copy = *Skyline_pair::unsmob (sp); if (a == Y_AXIS && Stem::has_interface (e) && to_boolean (me->get_maybe_pure_property ("add-stem-support", pure, start, end)))