X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=29313f1ccbac720f4d64466c72e0b79eb75c55be;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=959bf2156b25338711cab33e5430dcd923a4c4ab;hpb=73d087a6589038ac21efe802fe6d51cafa411749;p=lilypond.git

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 959bf2156b..29313f1ccb 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rest-collision.hh"
@@ -21,6 +21,7 @@ using namespace std;
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
+#include "grob.hh"
 #include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);
@@ -40,7 +41,7 @@ Rest_collision::force_shift_callback (SCM smob)
   return scm_from_double (0.0);
 }
 
-MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, "");
 SCM
 Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
 {
@@ -86,11 +87,14 @@ Rest_collision::add_column (Grob *me, Grob *p)
   TODO: look at horizontal-shift to determine ordering between rests
   for more than two voices.
 */
-MAKE_SCHEME_CALLBACK(Rest_collision, calc_positioning_done, 1);
+MAKE_SCHEME_CALLBACK (Rest_collision, calc_positioning_done, 1);
 SCM
 Rest_collision::calc_positioning_done (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
+
+  me->set_property ("positioning-done", SCM_BOOL_T);
+
   extract_grob_set (me, "elements", elts);
 
   vector<Grob*> rests;
@@ -100,16 +104,7 @@ Rest_collision::calc_positioning_done (SCM smob)
     {
       Grob *e = elts[i];
       if (unsmob_grob (e->get_object ("rest")))
-	{
-	  /*
-	    Ignore rests under beam.
-	  */
-	  Grob *st = unsmob_grob (e->get_object ("stem"));
-	  if (st && unsmob_grob (st->get_object ("beam")))
-	    continue;
-
-	  rests.push_back (e);
-	}
+	rests.push_back (e);
       else
 	notes.push_back (e);
     }
@@ -125,7 +120,7 @@ Rest_collision::calc_positioning_done (SCM smob)
     no partners to collide with
   */
   if (rests.size () + notes.size () < 2)
-    return SCM_UNSPECIFIED;
+    return SCM_BOOL_T;
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   /*
@@ -147,7 +142,7 @@ Rest_collision::calc_positioning_done (SCM smob)
 	  if (d)
 	    ordered_rests[d].push_back (rests[i]);
 	  else
-	    rests[d]->warning (_ ("can't resolve rest collision: rest direction not set"));
+	    rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set"));
 	}
 
       Direction d = LEFT;
@@ -163,7 +158,7 @@ Rest_collision::calc_positioning_done (SCM smob)
 	      if (ordered_rests[-d].size () > 1)
 		ordered_rests[-d][0]->warning (_ ("too many colliding rests"));
 
-	      return SCM_UNSPECIFIED;
+	      return SCM_BOOL_T;
 	    }
 	}
       while (flip (&d) != LEFT);
@@ -218,22 +213,38 @@ Rest_collision::calc_positioning_done (SCM smob)
 	  }
 
       if (!rcol)
-	return SCM_UNSPECIFIED;
+	return SCM_BOOL_T;
 
       Grob *rest = Note_column::get_rest (rcol);
       Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
 
       Interval restdim = rcol->extent (common, Y_AXIS);
       if (restdim.is_empty ())
-	return SCM_UNSPECIFIED;
+	return SCM_BOOL_T;
 
       Real staff_space = Staff_symbol_referencer::staff_space (rcol);
       Real minimum_dist = robust_scm2double (me->get_property ("minimum-distance"), 1.0) * staff_space;
 
       Interval notedim;
       for (vsize i = 0; i < notes.size (); i++)
-	notedim.unite (notes[i]->extent (common, Y_AXIS));
-
+	{
+	  if (Note_column::dir (notes[i]) == -dir)
+	    {
+	      /* try not to look at the stem, as looking at a beamed
+		 note may trigger beam positioning prematurely.
+
+		 This happens with dotted rests, which need Y
+		 positioning to compute X-positioning.
+	      */
+	      Grob *head = Note_column::first_head (notes[i]);
+	      if (head)
+		notedim.unite (head->extent (common, Y_AXIS));
+	      else
+		programming_error ("Note_column without first_head()");
+	    }
+	  else
+	    notedim.unite (notes[i]->extent (common, Y_AXIS));
+	}
 
       Real y = dir * max (0.0,
 			  -dir * restdim[-dir] + dir * notedim[dir]  + minimum_dist);
@@ -257,15 +268,16 @@ Rest_collision::calc_positioning_done (SCM smob)
 
       Note_column::translate_rests (rcol, discrete_y);
     }
-  return SCM_UNSPECIFIED;
+  return SCM_BOOL_T;
 }
 
-ADD_INTERFACE (Rest_collision, "rest-collision-interface",
-	       "Move around ordinary rests (not multi-measure-rests) to avoid "
-	       "conflicts.",
+ADD_INTERFACE (Rest_collision,
+	       "Move around ordinary rests (not multi-measure-rests) to avoid"
+	       " conflicts.",
 
 	       /* properties */
 	       "minimum-distance "
 	       "positioning-done "
-	       "elements");
+	       "elements "
+	       );