X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Frest-collision.cc;h=1b5b2ee85a70eca7a178996103c05fd90f9f7ce2;hb=0c34fe54a73dec156d4ed33a47647388588385df;hp=8ba0d49c7bc43db14cab429444cde325e9076c9c;hpb=ade39b0e10fdf852db6254afac36473a1c66a4d3;p=lilypond.git

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 8ba0d49c7b..1b5b2ee85a 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -1,9 +1,20 @@
 /*
-  rest-collision.cc -- implement Rest_collision
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "rest-collision.hh"
@@ -14,6 +25,7 @@ using namespace std;
 #include "directional-element-interface.hh"
 #include "duration.hh"
 #include "international.hh"
+#include "item.hh"
 #include "note-column.hh"
 #include "output-def.hh"
 #include "pointer-group-interface.hh"
@@ -41,7 +53,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)
 {
@@ -87,7 +99,7 @@ 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)
 {
@@ -227,8 +239,27 @@ Rest_collision::calc_positioning_done (SCM smob)
 
       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
+	      // If the note has already happened (but it has a long duration, so there is a collision),
+	      // don't look at the stem. If we do, the rest gets shifted down a lot and it looks bad.
+	      || dynamic_cast<Item*> (notes[i])->get_column () != dynamic_cast<Item*> (rest)->get_column ())
+	    {
+	      /* 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);
@@ -256,11 +287,12 @@ Rest_collision::calc_positioning_done (SCM smob)
 }
 
 ADD_INTERFACE (Rest_collision,
-	       "Move around ordinary rests (not multi-measure-rests) to avoid "
-	       "conflicts.",
+	       "Move around ordinary rests (not multi-measure-rests) to avoid"
+	       " conflicts.",
 
 	       /* properties */
 	       "minimum-distance "
 	       "positioning-done "
-	       "elements");
+	       "elements "
+	       );