Fix #58.

Don't ignore beamed rests when doing note/rest collisions.

diff --git a/input/regression/rest-collision-beam-note.ly b/input/regression/rest-collision-beam-note.ly
new file mode 100644 (file)
index 0000000..d8bdcb1
--- /dev/null
+++ b/input/regression/rest-collision-beam-note.ly
@@ -0,0 +1,17 @@
+
+\header {
+
+  texidoc = "Beam/rest collision resolution and normal rest/note
+collisions can be combined."
+
+}
+
+\version "2.10.7"
+
+\layout { ragged-right=##t }
+
+\new Staff \relative
+<<
+  {  s8 f4 } \\
+  {  <f, a>8[ r <a d>] }
+>>

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index f748b56a829641e5ecdece06bd80288648640868..5825671a17c69eeb84c28020c2c435820b232bb8 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -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);
     }