Oops, actually add new INSTALL file.

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

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index ceee8a37cba397e79f099f9aaf41c5b1238d7809..43665211bfeb649b4e172d314018b4385ea09380 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -201,6 +201,17 @@ Side_position_interface::pure_y_aligned_side (SCM smob, SCM start, SCM end, SCM
                                   cur_off);
 }
 
+MAKE_SCHEME_CALLBACK (Side_position_interface, calc_cross_staff, 1)
+SCM
+Side_position_interface::calc_cross_staff (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "side-support-elements", elts);
+
+  Grob *common = common_refpoint_of_array (elts, me->get_parent (Y_AXIS), Y_AXIS);
+  return scm_from_bool (common != me->get_parent (Y_AXIS));
+}
+
 SCM
 Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, int end,
                                       Real *current_off)
@@ -236,7 +247,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
                o += dir * 0.5 * ss;
            }
        }
-      else if (scm_is_number (me->get_property ("staff-padding")))
+      else if (scm_is_number (me->get_property ("staff-padding")) && dir)
        {
          Interval iv = me->maybe_pure_extent (me, a, pure, start, end);