X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=dcd6f237d34e962f2456979dec476cb76a3d6bb9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=43665211bfeb649b4e172d314018b4385ea09380;hpb=7fd334610982d6b4dd16696eff302544acaa8fed;p=lilypond.git

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 43665211bf..dcd6f237d3 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -3,26 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "side-position-interface.hh"
 
 #include <cmath>		// ceil.
 #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 "grob.hh"
+#include "warn.hh"
 
 void
 Side_position_interface::add_support (Grob *me, Grob *e)
@@ -80,24 +81,35 @@ 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));
-	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 ())
     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);
 
@@ -208,6 +220,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));
 }
@@ -238,9 +254,11 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
 	  Real rounded = directed_round (position, dir);
 	  Grob *head = me->get_parent (X_AXIS);
 
-	  if (fabs (position) <= 2 * Staff_symbol_referencer::staff_radius (me) + 1 
+	  if (fabs (position) <= 2 * Staff_symbol_referencer::staff_radius (me) + 1
+	      /* In case of a ledger lines, quantize even if we're outside the staff. */
 	      || (Note_head::has_interface (head)
-		  && sign (Staff_symbol_referencer::get_position (head)) == - dir))
+		  
+		  && abs (Staff_symbol_referencer::get_position (head)) > abs (position)))
 	    {
 	      o += (rounded - position) * 0.5 * ss;
 	      if (Staff_symbol_referencer::on_line (me, int (rounded)))
@@ -251,7 +269,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"));
 
@@ -278,22 +296,28 @@ Side_position_interface::set_axis (Grob *me, Axis a)
 			     a);
     }
 }
+
 Axis
 Side_position_interface::get_axis (Grob *me)
 {
   if (scm_is_number (me->get_property ("side-axis")))
     return Axis (scm_to_int (me->get_property ("side-axis")));
   
-  me->programming_error ("side-axis not set.");
+  string msg = String_convert::form_string ("side-axis not set for grob %s.",
+					    me->name ().c_str ());
+  me->programming_error (msg);
   return NO_AXES;
 }
 
 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 "