Merge with master

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

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 3e823288378faa780767edfbebe2ababb19326f5..b8ad86ba916a9c5e31633da5d44a7548a4bcdb51 100644 (file)
--- 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"
@@ -101,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);
     }
@@ -126,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);
   /*
@@ -148,7 +139,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;
@@ -164,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);
@@ -219,14 +210,14 @@ 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;
@@ -258,7 +249,7 @@ 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,