X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=19d9a88dc8ac86676ff2496a636c77167dc5dead;hb=2a00c69a012d4ccaf24a036bdb5ac9ea43fb9604;hp=73854bdc40cd0dc9b3899e3627e7fe67bad015d0;hpb=13a8e28de140702edbb0629002073972008e17ad;p=lilypond.git

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 73854bdc40..19d9a88dc8 100644
--- 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "side-position-interface.hh"
@@ -12,16 +12,17 @@
 #include <algorithm>
 using namespace std;
 
-#include "note-head.hh"
-#include "warn.hh"
+#include "directional-element-interface.hh"
+#include "grob.hh"
 #include "main.hh"
-#include "staff-symbol-referencer.hh"
+#include "misc.hh"
+#include "note-head.hh"
 #include "pointer-group-interface.hh"
-#include "directional-element-interface.hh"
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
+#include "stem.hh"
 #include "string-convert.hh"
-#include "misc.hh"
+#include "warn.hh"
 
 void
 Side_position_interface::add_support (Grob *me, Grob *e)
@@ -79,9 +80,20 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
 	dim.unite (staff_extents);
     }
 
+  Direction dir = get_grob_direction (me);
+
   for (vsize i = 0; i < support.size (); i++)
     {
       Grob *e = support[i];
+
+      // In the case of a stem, we will find a note head as well
+      // ignoring the stem solves cyclic dependencies if the stem is
+      // attached to a cross-staff beam.
+      if (a == Y_AXIS
+	  && Stem::has_interface (e)
+	  && dir == - get_grob_direction (e))
+	continue;
+      
       if (e)
 	if (use_extents)
 	  dim.unite (e->maybe_pure_extent (common, a, pure, start, end));
@@ -95,8 +107,6 @@ Side_position_interface::general_side_position (Grob *me, Axis a, bool use_exten
   if (dim.is_empty ())
     dim = Interval (0, 0);
 
-  Direction dir = get_grob_direction (me);
-
   Real off = me->get_parent (a)->maybe_pure_coordinate (common, a, pure, start, end);
   Real minimum_space = ss * robust_scm2double (me->get_property ("minimum-space"), -1);
 
@@ -176,21 +186,21 @@ axis_aligned_side_helper (SCM smob, Axis a, bool pure, int start, int end, SCM c
 }
 
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, x_aligned_side, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, x_aligned_side, 2, 1, "");
 SCM
 Side_position_interface::x_aligned_side (SCM smob, SCM current_off)
 {
   return axis_aligned_side_helper (smob, X_AXIS, false, 0, 0, current_off);
 }
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, y_aligned_side, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, y_aligned_side, 2, 1, "");
 SCM
 Side_position_interface::y_aligned_side (SCM smob, SCM current_off)
 {
   return axis_aligned_side_helper (smob, Y_AXIS, false, 0, 0, current_off);
 }
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, pure_y_aligned_side, 4, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Side_position_interface, pure_y_aligned_side, 4, 1, "");
 SCM
 Side_position_interface::pure_y_aligned_side (SCM smob, SCM start, SCM end, SCM cur_off)
 {
@@ -200,6 +210,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)
@@ -235,7 +256,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);
 	  
@@ -276,7 +297,7 @@ Side_position_interface::get_axis (Grob *me)
   return NO_AXES;
 }
 
-ADD_INTERFACE (Side_position_interface, "side-position-interface",
+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 "