From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 1 Jan 2007 17:00:10 +0000 (+0100)
Subject: Fix #58.
X-Git-Tag: release/2.11.7-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ac7bcc6e6f08ad6d6e3d2f976f1e27ff05374439;p=lilypond.git

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
index 0000000000..d8bdcb13e6
--- /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 f748b56a82..5825671a17 100644
--- 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);
     }