From d6a5ab877843613c9059d93fb2ffcbae8ff5f30d Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Fri, 31 May 2013 19:48:46 -0700 Subject: [PATCH] Revert "side-position-interface: use real positions of cross-staff grobs; issue 3363" This reverts commit 1c893a4e3651018adcc13ea2c8f1c19b19faa722. --- input/regression/slur-cross-staff-beam.ly | 8 +++----- lily/side-position-interface.cc | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/input/regression/slur-cross-staff-beam.ly b/input/regression/slur-cross-staff-beam.ly index 7d34fbbf04..12c9c1f7a9 100644 --- a/input/regression/slur-cross-staff-beam.ly +++ b/input/regression/slur-cross-staff-beam.ly @@ -1,15 +1,13 @@ \version "2.16.0" \header { - texidoc = "Slurs that depend on a cross-staff beam are not calculated until -after line-breaking and after inside-going articulations have been placed." + texidoc = "Slurs that depend on a cross-staff beam are not calculated until after line-breaking." } \paper { ragged-right=##t } \score { \new PianoStaff << - \context Staff = rh \relative c'' { c8([ d) \change Staff = lh c,] r - \stemDown c'8 \change Staff = rh c_( \change Staff = lh c_\marcato c)} - \context Staff = lh { s1 } + \context Staff = rh \relative c'' { c8([ d) \change Staff = lh c,] } + \context Staff = lh { s4. } >> } diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 7b816ab0be..dad906f51b 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -284,7 +284,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i (e->get_maybe_pure_property (a == X_AXIS ? "horizontal-skylines" : "vertical-skylines", - pure, + pure || cross_staff, start, end)); -- 2.39.5