Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

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

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index faa5504942df6d41e191aeec6da866b404ea68b4..f6957f9eea8bcf87f4dca26482dcfb18d410433f 100644 (file)
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -42,6 +42,20 @@ Script_interface::get_stencil (Grob *me, Direction d)
   return Stencil ();
 }
 
+MAKE_SCHEME_CALLBACK (Script_interface, calc_positioning_done, 1);
+SCM
+Script_interface::calc_positioning_done (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  if (Grob *par = me->get_parent (X_AXIS))
+    {
+      Grob *stem = Note_column::get_stem (par);
+      if (stem && Stem::first_head (stem))
+       me->set_parent (Stem::first_head (stem), X_AXIS);
+    }
+  return SCM_BOOL_T;
+}
+
 MAKE_SCHEME_CALLBACK (Script_interface, calc_direction, 1);
 SCM
 Script_interface::calc_direction (SCM smob)
@@ -55,13 +69,7 @@ Script_interface::calc_direction (SCM smob)
       d = DOWN;
     }
 
-  if (Grob *par = me->get_parent (X_AXIS))
-    {
-      Grob *stem = Note_column::get_stem (par);
-      if (stem && Stem::first_head (stem))
-       me->set_parent (Stem::first_head (stem), X_AXIS);
-    }
-
+  (void) me->get_property ("positioning-done");
   return scm_from_int (d);
 }
 
@@ -71,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 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);
@@ -92,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 "
@@ -105,9 +124,12 @@ 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 "
               "script-priority "
               "script-stencil "
               "slur "