Run grand-replace for 2012

[lilypond.git] / lily / item.cc

diff --git a/lily/item.cc b/lily/item.cc
index 6a468a6830607f6522f786c7dc15cfefdebdd5b8..ff77f5feacc5995286bdb154c6a929ef471c871d 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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))
@@ -130,6 +127,15 @@ Item::find_broken_piece (System *l) const
   return 0;
 }
 
+Item *
+Item::maybe_find_prebroken_piece (Item *g, Direction d)
+{
+  Item *ret = g->find_prebroken_piece (d);
+  if (ret)
+    return ret;
+  return g;
+}
+
 Item *
 Item::find_prebroken_piece (Direction d) const
 {