From ac7bcc6e6f08ad6d6e3d2f976f1e27ff05374439 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 1 Jan 2007 18:00:10 +0100 Subject: [PATCH] Fix #58. Don't ignore beamed rests when doing note/rest collisions. --- input/regression/rest-collision-beam-note.ly | 17 +++++++++++++++++ lily/rest-collision.cc | 11 +---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 input/regression/rest-collision-beam-note.ly 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 } \\ + { 8[ r ] } +>> 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); } -- 2.39.2