X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=8c2e36106f8a410e8bfd414c058ed477d7177283;hb=f818a60416d32dcced3d17d971c5fa959d4cecdc;hp=1f9e605fb96f10d5e26bccb8507a87f7d9a0adbc;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index 1f9e605fb9..8c2e36106f 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)
 {
@@ -221,7 +220,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 +240,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 +352,24 @@ 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);
+  Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
+  assert (staff); // delete me
+  extract_grob_set (me, "note-columns", cols);
+
+  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;
+}
 
 ADD_INTERFACE (Slur,