From: Keith OHara Date: Tue, 14 May 2013 07:26:55 +0000 (-0700) Subject: side-position-interface: use real positions of cross-staff grobs; issue 3363 X-Git-Tag: release/2.17.19-1~8^2~8 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=1c893a4e3651018adcc13ea2c8f1c19b19faa722;p=lilypond.git side-position-interface: use real positions of cross-staff grobs; issue 3363 --- diff --git a/input/regression/slur-cross-staff-beam.ly b/input/regression/slur-cross-staff-beam.ly index 12c9c1f7a9..7d34fbbf04 100644 --- a/input/regression/slur-cross-staff-beam.ly +++ b/input/regression/slur-cross-staff-beam.ly @@ -1,13 +1,15 @@ \version "2.16.0" \header { - texidoc = "Slurs that depend on a cross-staff beam are not calculated until after line-breaking." + texidoc = "Slurs that depend on a cross-staff beam are not calculated until +after line-breaking and after inside-going articulations have been placed." } \paper { ragged-right=##t } \score { \new PianoStaff << - \context Staff = rh \relative c'' { c8([ d) \change Staff = lh c,] } - \context Staff = lh { s4. } + \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 } >> } diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index dad906f51b..7b816ab0be 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 || cross_staff, + pure, start, end));