Fix #629.

[lilypond.git] / lily / script-interface.cc

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index 6db959113e846e182fb0d724956b8dc62a0ffa25..f6957f9eea8bcf87f4dca26482dcfb18d410433f 100644 (file)
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -79,7 +79,18 @@ Script_interface::calc_cross_staff (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Grob *stem = Note_column::get_stem (me->get_parent (X_AXIS));
-  return scm_from_bool (stem && to_boolean (stem->get_property ("cross-staff")));
+
+  if (stem && to_boolean (stem->get_property ("cross-staff")))
+    return SCM_BOOL_T;
+
+  Grob *slur = unsmob_grob (me->get_object ("slur"));
+  SCM avoid_slur = me->get_property ("avoid-slur");
+  if (slur && to_boolean (slur->get_property ("cross-staff"))
+      && (avoid_slur == ly_symbol2scm ("outside")
+         || avoid_slur == ly_symbol2scm ("around")))
+    return SCM_BOOL_T;
+
+  return SCM_BOOL_F;
 }
 
 MAKE_SCHEME_CALLBACK (Script_interface, print, 1);
@@ -100,7 +111,7 @@ struct Text_script
 };
 
 ADD_INTERFACE (Text_script,
-              "An object that is put above or below a note",
+              "An object that is put above or below a note.",
 
               /* properties */
               "add-stem-support "
@@ -113,7 +124,9 @@ ADD_INTERFACE (Text_script,
   Hmm. Where should we put add-stem-support ?
 */
 ADD_INTERFACE (Script_interface,
-              "An object that is put above or below a note",
+              "An object that is put above or below a note.",
+
+              /* properties */
               "add-stem-support "
               "avoid-slur "
               "positioning-done "