X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=59737b5ac49ff9ec84a0a6c3cf9f264ec82b9c5b;hb=18b1975ebc7601abf5fb49df87d5a965c53fce9b;hp=6db959113e846e182fb0d724956b8dc62a0ffa25;hpb=8ecb76de70d0ef58d899de0c3a5a65c4d874af43;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index 6db959113e..59737b5ac4 100644
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-interface.hh"
@@ -33,9 +33,6 @@ Script_interface::get_stencil (Grob *me, Direction d)
       return Font_interface::get_default_font (me)
 	->find_by_name ("scripts." + ly_scm2string (str));
     }
-  else if (key == ly_symbol2scm ("accordion"))
-    return Lookup::accordion (scm_cdr (s), 1.0,
-			      Font_interface::get_default_font (me));
   else
     assert (false);
 
@@ -79,7 +76,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 +108,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,12 +121,15 @@ 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 "
+	       "toward-stem-shift "
 	       "slur "
 	       "slur-padding "
 	       );