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

diff --git a/lily/item.cc b/lily/item.cc
index c3718796e011e9a3e4aaff55028df44c344431d7..97fe1de208b89215800d151144993b438ab5b1da 100644 (file)
--- 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))