tweaks.

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index c2e00f243d34f85f0f1a76d813ed9009bb86a630..d8c7652f5c5fc3d949539d51f460024c46dd4fdc 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -28,7 +28,7 @@
 #include "warn.hh"
 #include "slur-scoring.hh"
 #include "separation-item.hh"
-#include "script-interface.hh"
+#include "international.hh"
 
 
 
@@ -353,9 +353,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, cross_staff, 1)
+SCM
+Slur::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,