Trim includes of dimension-cache.hh.

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

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index a289aea5b3d136e20211a12cfd3a8a4978e58932..73da30e9e32d26fc3d9c65a35fedcdb7d0c880c3 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -218,6 +218,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));
 }
@@ -290,6 +294,7 @@ Side_position_interface::set_axis (Grob *me, Axis a)
                             a);
     }
 }
+
 Axis
 Side_position_interface::get_axis (Grob *me)
 {
@@ -303,11 +308,14 @@ Side_position_interface::get_axis (Grob *me)
 }
 
 ADD_INTERFACE (Side_position_interface,
-              "Position a victim object (this one) next to other objects (the "
-              "support).   The property @code{direction} signifies where to put the  "
-              "victim object relative to the support (left or right, up or down?)\n\n "
-              "The routine also takes the size the staff into account if "
-              "@code{staff-padding} is set. If undefined, the staff symbol is ignored.",
+              "Position a victim object (this one) next to other objects"
+              " (the support).  The property @code{direction} signifies where"
+              " to put the victim object relative to the support (left or"
+              " right, up or down?)\n"
+              "\n"
+              "The routine also takes the size of the staff into account if"
+              " @code{staff-padding} is set.  If undefined, the staff symbol"
+              " is ignored.",
 
               /* properties */
               "direction "