X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-interface.cc;h=a525500b2c39a76aae127fa89b6561fe04cba539;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6aa4c538840aaa3838d067bc06cf22db4cb4a46d;hpb=54feef141b22b56abf5e4a47c05bf8bbf99d4930;p=lilypond.git

diff --git a/lily/script-interface.cc b/lily/script-interface.cc
index 6aa4c53884..a525500b2c 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--2008 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"
@@ -32,24 +33,31 @@ 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);
 
   return Stencil ();
 }
 
-/*
-todo: use proper callbacks.
-*/
-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)
@@ -58,15 +66,28 @@ Script_interface::before_line_breaking (SCM smob)
       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);
@@ -76,22 +97,18 @@ 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 "
@@ -103,10 +120,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 "