Fix cyclic dependence with rest-collisions.

[lilypond.git] / lily / rest-collision.cc

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index e0a494c0c5431fc9440850372c965bbb35303587..ee6935c7d8578526d0a31d13a20ad574831c3d30 100644 (file)
--- 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"
@@ -24,23 +36,6 @@ using namespace std;
 #include "grob.hh"
 #include "warn.hh"
 
-MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);
-SCM
-Rest_collision::force_shift_callback (SCM smob)
-{
-  Grob *them = unsmob_grob (smob);
-  if (Note_column::has_rests (them))
-    {
-      Grob *collision = unsmob_grob (them->get_object ("rest-collision"));
-
-      if (collision)
-       {
-         (void) collision->get_property ("positioning-done");
-       }
-    }
-  return scm_from_double (0.0);
-}
-
 MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, "");
 SCM
 Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
@@ -55,8 +50,13 @@ Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
   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 ());
+  if (Note_column::has_interface (parent) && Note_column::has_rests (parent))
+    {
+      Grob *collision = unsmob_grob (parent->get_object ("rest-collision"));
+
+      if (collision)
+       (void) collision->get_property ("positioning-done");
+    }
 
   return scm_from_double (0.0);
 }
@@ -66,13 +66,6 @@ Rest_collision::add_column (Grob *me, Grob *p)
 {
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
 
-  /*
-    only add callback for the rests, since we don't move anything
-    else.
-
-    (not?)
-  */
-  add_offset_callback (p, Rest_collision::force_shift_callback_proc, Y_AXIS);
   p->set_object ("rest-collision", me->self_scm ());
 
   Grob *rest = unsmob_grob (p->get_object ("rest"));
@@ -218,7 +211,7 @@ Rest_collision::calc_positioning_done (SCM smob)
       Grob *rest = Note_column::get_rest (rcol);
       Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
 
-      Interval restdim = rcol->extent (common, Y_AXIS);
+      Interval restdim = rest->extent (common, Y_AXIS);
       if (restdim.is_empty ())
        return SCM_BOOL_T;
 
@@ -228,7 +221,10 @@ Rest_collision::calc_positioning_done (SCM smob)
       Interval notedim;
       for (vsize i = 0; i < notes.size (); i++)
        {
-         if (Note_column::dir (notes[i]) == -dir)
+         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.