From: Keith OHara <k-ohara5a5a@oco.net>
Date: Mon, 28 Nov 2011 08:54:27 +0000 (-0800)
Subject: item.cc: make is_non_musical() conform to its name. issue 2060
X-Git-Tag: release/2.15.21-1~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=97513556d46fe23903e305e4147c5feccc97914d;p=lilypond.git

item.cc: make is_non_musical() conform to its name. issue 2060
---

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<Item *> (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))