Prepare introduction of Waf build system

[lilypond.git] / lily / side-position-interface.cc

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index c1b848bfce7370007b95f9d033c0bf0b6bb0ae6b..0024408b79342e80234a2c071ca42deda26e2b3d 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "side-position-interface.hh"
@@ -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
@@ -96,13 +99,15 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
        continue;
       
       if (e)
-       if (use_extents)
-         dim.unite (e->maybe_pure_extent (common, a, pure, start, end));
-       else
-         {
-           Real x = e->maybe_pure_coordinate (common, a, pure, start, end);
-           dim.unite (Interval (x, x));
-         }
+       {
+         if (use_extents)
+           dim.unite (e->maybe_pure_extent (common, a, pure, start, end));
+         else
+           {
+             Real x = e->maybe_pure_coordinate (common, a, pure, start, end);
+             dim.unite (Interval (x, x));
+           }
+       }
     }
 
   if (dim.is_empty ())
@@ -218,6 +223,10 @@ Side_position_interface::calc_cross_staff (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "side-support-elements", elts);
 
+  for (vsize i = 0; i < elts.size (); i++)
+    if (to_boolean (elts[i]->get_property ("cross-staff")))
+      return SCM_BOOL_T;
+
   Grob *common = common_refpoint_of_array (elts, me->get_parent (Y_AXIS), Y_AXIS);
   return scm_from_bool (common != me->get_parent (Y_AXIS));
 }
@@ -263,7 +272,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
        {
          Interval iv = me->maybe_pure_extent (me, a, pure, start, end);
          
-         Real padding
+         Real padding
            = Staff_symbol_referencer::staff_space (me)
            * scm_to_double (me->get_property ("staff-padding"));
 
@@ -290,6 +299,7 @@ Side_position_interface::set_axis (Grob *me, Axis a)
                             a);
     }
 }
+
 Axis
 Side_position_interface::get_axis (Grob *me)
 {
@@ -302,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"