From 97513556d46fe23903e305e4147c5feccc97914d Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Mon, 28 Nov 2011 00:54:27 -0800 Subject: [PATCH] item.cc: make is_non_musical() conform to its name. issue 2060 --- lily/item.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lily/item.cc b/lily/item.cc index c3718796e0..97fe1de208 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -55,9 +55,6 @@ Item::Item (Item const &s) bool Item::is_non_musical (Grob *me) { - if (me->original ()) - return false; - Item *i = dynamic_cast (me->get_parent (X_AXIS)); return i ? Item::is_non_musical (i) : to_boolean (me->get_property ("non-musical")); } @@ -105,7 +102,7 @@ Item::is_broken () const void Item::discretionary_processing () { - if (is_broken ()) + if (is_broken () || original ()) return; if (Item::is_non_musical (this)) -- 2.39.5