From: Joe Neeman <joeneeman@gmail.com>
Date: Thu, 12 Jul 2007 08:48:19 +0000 (+1000)
Subject: fix Slur::calc_cross_staff
X-Git-Tag: release/2.11.28-1~14^2~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d3bfb82aaa8ed036613756c34ce663304aeaf826;p=lilypond.git

fix Slur::calc_cross_staff
---

diff --git a/lily/slur.cc b/lily/slur.cc
index 8c2e36106f..ca22e9af97 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -361,14 +361,14 @@ SCM
 Slur::calc_cross_staff (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
-  assert (staff); // delete me
+
   extract_grob_set (me, "note-columns", cols);
+  extract_grob_set (me, "encompass-objects", extras);
+
+  Grob *common = common_refpoint_of_array (cols, me, Y_AXIS);
+  common = common_refpoint_of_array (extras, common, Y_AXIS);
 
-  for (vsize i = 0; i < cols.size (); i++)
-    if (Staff_symbol_referencer::get_staff_symbol (cols[i]) != staff)
-      return SCM_BOOL_T;
-  return SCM_BOOL_F;
+  return scm_from_bool (common != me->get_parent (Y_AXIS));
 }
 
 ADD_INTERFACE (Slur,