X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=0024408b79342e80234a2c071ca42deda26e2b3d;hb=933acc9467da9d5ed6bd20eedc483e8b79ce58c0;hp=ed3af0577a8a0e726adfb86f079a58d513a06dda;hpb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;p=lilypond.git

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index ed3af0577a..0024408b79 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -13,8 +13,10 @@
 
 using namespace std;
 
+#include "axis-group-interface.hh"
 #include "directional-element-interface.hh"
 #include "grob.hh"
+#include "grob-array.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "note-head.hh"
@@ -23,6 +25,7 @@ using namespace std;
 #include "staff-symbol.hh"
 #include "stem.hh"
 #include "string-convert.hh"
+#include "system.hh"
 #include "warn.hh"
 
 void
@@ -309,6 +312,51 @@ Side_position_interface::get_axis (Grob *me)
   return NO_AXES;
 }
 
+MAKE_SCHEME_CALLBACK (Side_position_interface, move_to_extremal_staff, 1);
+SCM
+Side_position_interface::move_to_extremal_staff (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  System *sys = dynamic_cast<System*> (me->get_system ());
+  Direction dir = Side_position_interface::get_direction (me);
+  if (dir != DOWN)
+    dir = UP;
+
+  Interval iv = me->extent (sys, X_AXIS);
+  iv.widen (1.0);
+  Grob *top_staff = sys->get_extremal_staff (dir, iv);
+
+  if (!top_staff)
+    return SCM_BOOL_F;
+
+  // Only move this grob if it is a direct child of the system.  We
+  // are not interested in moving marks from other staves to the top
+  // staff; we only want to move marks from the system to the top
+  // staff.
+  if (sys != me->get_parent (Y_AXIS))
+    return SCM_BOOL_F;
+
+  me->set_parent (top_staff, Y_AXIS);
+  me->flush_extent_cache (Y_AXIS);
+  Axis_group_interface::add_element (top_staff, me);
+
+  // Remove any cross-staff side-support dependencies
+  Grob_array *ga = unsmob_grob_array (me->get_object ("side-support-elements"));
+  if (ga)
+    {
+      vector<Grob*> const& elts = ga->array ();
+      vector<Grob*> new_elts;
+      for (vsize i = 0; i < elts.size (); ++i)
+	{
+	  if (me->common_refpoint (elts[i], Y_AXIS) == top_staff)
+	    new_elts.push_back (elts[i]);
+	}
+      ga->set_array (new_elts);
+    }
+  return SCM_BOOL_T;
+}
+
+
 ADD_INTERFACE (Side_position_interface,
 	       "Position a victim object (this one) next to other objects"
 	       " (the support).  The property @code{direction} signifies where"