X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=b8ad86ba916a9c5e31633da5d44a7548a4bcdb51;hb=5837be11cf336e61e7134097f507ad47e9bd9e68;hp=589dd0dbecf9cb1e2739161b2dbbab691280a9df;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 589dd0dbec..b8ad86ba91 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--2007 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 (Rest_collision, force_shift_callback_rest, 2);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1);
 SCM
 Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
 {
@@ -51,7 +52,8 @@ Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
     translate REST; we need the result of this translation later on,
     while the offset probably still is 0/calculation-in-progress.
    */
-  rest_grob->translate_axis (scm_to_double (offset), Y_AXIS);
+  if (scm_is_number (offset))
+    rest_grob->translate_axis (scm_to_double (offset), Y_AXIS);
   
   if (Note_column::has_interface (parent))
     force_shift_callback (parent->self_scm ());
@@ -99,16 +101,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);
     }
@@ -124,7 +117,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);
   /*
@@ -146,12 +139,12 @@ 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;
       do
-	vector_sort (ordered_rests[d], Note_column::shift_compare);
+	vector_sort (ordered_rests[d], Note_column::shift_less);
       while (flip (&d) != LEFT)
 	;
 
@@ -162,7 +155,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);
@@ -212,18 +205,19 @@ Rest_collision::calc_positioning_done (SCM smob)
       for (vsize i = rests.size (); !rcol && i--;)
 	if (Note_column::dir (rests[i]))
 	  {
-	    dir = Note_column::dir (rests[i]);
 	    rcol = rests[i];
+	    dir = Note_column::dir (rcol);
 	  }
 
       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;
@@ -232,9 +226,10 @@ Rest_collision::calc_positioning_done (SCM smob)
       for (vsize i = 0; i < notes.size (); i++)
 	notedim.unite (notes[i]->extent (common, Y_AXIS));
 
-      Real dist
-	= minimum_dist + dir * max (notedim[dir] - restdim[-dir], 0.0);
 
+      Real y = dir * max (0.0,
+			  -dir * restdim[-dir] + dir * notedim[dir]  + minimum_dist);
+      
       int stafflines = Staff_symbol_referencer::line_count (me);
       if (!stafflines)
 	{
@@ -243,18 +238,21 @@ Rest_collision::calc_positioning_done (SCM smob)
 	}
 
       // move discretely by half spaces.
-      int discrete_dist = int (ceil (dist / (0.5 * staff_space)));
+      int discrete_y = dir * int (ceil (y / (0.5 * dir * staff_space)));
 
       // move by whole spaces inside the staff.
-      if (discrete_dist < stafflines + 1)
-	discrete_dist = int (ceil (discrete_dist / 2.0) * 2.0);
+      if (fabs (Staff_symbol_referencer::get_position (rest)
+		+ discrete_y) < stafflines + 1)
+	{
+	  discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0);
+	}
 
-      Note_column::translate_rests (rcol, dir * discrete_dist);
+      Note_column::translate_rests (rcol, discrete_y);
     }
-  return SCM_UNSPECIFIED;
+  return SCM_BOOL_T;
 }
 
-ADD_INTERFACE (Rest_collision, "rest-collision-interface",
+ADD_INTERFACE (Rest_collision,
 	       "Move around ordinary rests (not multi-measure-rests) to avoid "
 	       "conflicts.",