X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=f6957f9eea8bcf87f4dca26482dcfb18d410433f;hb=1c4ee4f6b4e6f31602eff804e2ab66d6e658a585;hp=1b313ffc65819099e0aa6539913eabb664aa76bc;hpb=93d8a78cb51e4440e7fd0c25d3c0cb66128d6190;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index 1b313ffc65..f6957f9eea 100644
--- a/lily/script-interface.cc
+++ b/lily/script-interface.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "script-interface.hh"
 
 #include "directional-element-interface.hh"
+#include "item.hh"
 #include "warn.hh"
 #include "font-interface.hh"
 #include "side-position-interface.hh"
@@ -41,30 +42,55 @@ Script_interface::get_stencil (Grob *me, Direction d)
   return Stencil ();
 }
 
-MAKE_SCHEME_CALLBACK (Script_interface, before_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Script_interface, calc_positioning_done, 1);
 SCM
-Script_interface::before_line_breaking (SCM smob)
+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)
+{
+  Grob *me = unsmob_grob (smob);
   Direction d = Side_position_interface::get_direction (me);
 
   if (!d)
     {
-      /* FIXME: This should never happen: `arbitrary' directions.  */
-      programming_error ("script direction not yet known");
+      me->programming_error ("script direction not yet known");
       d = DOWN;
     }
 
-  set_grob_direction (me, d);
+  (void) me->get_property ("positioning-done");
+  return scm_from_int (d);
+}
 
-  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_UNSPECIFIED;
+MAKE_SCHEME_CALLBACK (Script_interface, calc_cross_staff, 1);
+SCM
+Script_interface::calc_cross_staff (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  Grob *stem = Note_column::get_stem (me->get_parent (X_AXIS));
+
+  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);
@@ -74,22 +100,20 @@ Script_interface::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  Direction dir = Side_position_interface::get_direction (me);
-  if (!dir)
-    {
-      programming_error ("script direction unknown, but stencil wanted");
-      dir = DOWN;
-    }
+  Direction dir = get_grob_direction (me);
+
   return get_stencil (me, dir).smobbed_copy ();
 }
 
 struct Text_script
 {
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE ();
 };
 
-ADD_INTERFACE (Text_script, "text-script-interface",
-	       "An object that is put above or below a note",
+ADD_INTERFACE (Text_script,
+	       "An object that is put above or below a note.",
+
+	       /* properties */
 	       "add-stem-support "
 	       "avoid-slur "
 	       "script-priority "
@@ -99,10 +123,13 @@ ADD_INTERFACE (Text_script, "text-script-interface",
 /*
   Hmm. Where should we put add-stem-support ?
 */
-ADD_INTERFACE (Script_interface, "script-interface",
-	       "An object that is put above or below a note",
+ADD_INTERFACE (Script_interface,
+	       "An object that is put above or below a note.",
+
+	       /* properties */
 	       "add-stem-support "
 	       "avoid-slur "
+	       "positioning-done "
 	       "script-priority "
 	       "script-stencil "
 	       "slur "