X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=22535ef7658c2c9ef8f8d65a96ff4c289ac4d6cd;hb=ba8a253a14cfcbd757fef0ad36232d371b88d23b;hp=1f9e605fb96f10d5e26bccb8507a87f7d9a0adbc;hpb=e172d5758ac4e3755640dac9374bd9e7ca0c6ed6;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index 1f9e605fb9..22535ef765 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -21,18 +21,17 @@
 #include "output-def.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
-#include "staff-symbol.hh"
 #include "stem.hh"
 #include "text-interface.hh"
 #include "tie.hh"
 #include "warn.hh"
 #include "slur-scoring.hh"
 #include "separation-item.hh"
-#include "script-interface.hh"
+#include "international.hh"
 
 
 
-MAKE_SCHEME_CALLBACK(Slur, calc_direction, 1)
+MAKE_SCHEME_CALLBACK (Slur, calc_direction, 1)
 SCM
 Slur::calc_direction (SCM smob)
 {
@@ -180,7 +179,10 @@ Slur::replace_breakable_encompass_objects (Grob *me)
 	{
 	  extract_grob_set (g, "elements", breakables);
 	  for (vsize j = 0; j < breakables.size (); j++)
-	    if (breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside"))
+	    /* if we encompass a separation-item that spans multiple staves,
+	       we filter out the grobs that don't belong to our staff */
+	    if (me->common_refpoint (breakables[j], Y_AXIS) == me->get_parent (Y_AXIS)
+		&& breakables[j]->get_property ("avoid-slur") == ly_symbol2scm ("inside"))
 	      new_encompasses.push_back (breakables[j]);
 	}
       else
@@ -221,7 +223,7 @@ Slur::add_extra_encompass (Grob *me, Grob *n)
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("encompass-objects"), n);
 }
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, pure_outside_slur_callback, 4, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, pure_outside_slur_callback, 4, 1, "");
 SCM
 Slur::pure_outside_slur_callback (SCM grob, SCM start_scm, SCM end_scm, SCM offset_scm)
 {
@@ -241,7 +243,7 @@ Slur::pure_outside_slur_callback (SCM grob, SCM start_scm, SCM end_scm, SCM offs
   return scm_from_double (offset + dir * slur->pure_height (slur, start, end).length () / 4);
 }
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, outside_slur_callback, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Slur, outside_slur_callback, 2, 1, "");
 SCM
 Slur::outside_slur_callback (SCM grob, SCM offset_scm)
 {
@@ -353,9 +355,31 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info,
 	}
     }
   else
-    e->warning ("Ignoring grob for slur. avoid-slur not set?");
+    e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?",
+		    e->name().c_str ()));
 }
 
+MAKE_SCHEME_CALLBACK (Slur, calc_cross_staff, 1)
+SCM
+Slur::calc_cross_staff (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+
+  extract_grob_set (me, "note-columns", cols);
+  extract_grob_set (me, "encompass-objects", extras);
+
+  /* the separation items are dealt with in replace_breakable_encompass_objects
+     so we can ignore them here */
+  vector<Grob*> non_sep_extras;
+  for (vsize i = 0; i < extras.size (); i++)
+    if (!Separation_item::has_interface (extras[i]))
+      non_sep_extras.push_back (extras[i]);
+
+  Grob *common = common_refpoint_of_array (cols, me, Y_AXIS);
+  common = common_refpoint_of_array (non_sep_extras, common, Y_AXIS);
+
+  return scm_from_bool (common != me->get_parent (Y_AXIS));
+}
 
 ADD_INTERFACE (Slur,