From: Keith OHara <k-ohara5a5a@oco.net>
Date: Sat, 1 Jun 2013 02:48:46 +0000 (-0700)
Subject: Revert "side-position-interface: use real positions of cross-staff grobs; issue 3363"
X-Git-Tag: release/2.17.20-1~27^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d6a5ab877843613c9059d93fb2ffcbae8ff5f30d;p=lilypond.git

Revert "side-position-interface: use real positions of cross-staff grobs; issue 3363"

This reverts commit 1c893a4e3651018adcc13ea2c8f1c19b19faa722.
---

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));