resolve merge

[lilypond.git] / lily / include / grob-info.hh

diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh
index 30c8f558bf5fdc61f935c68c6af9c044052a0fbb..56a49170a4bd1d52cfe2bcecbc1140730b87ef0a 100644 (file)
--- a/lily/include/grob-info.hh
+++ b/lily/include/grob-info.hh
@@ -1,9 +1,20 @@
 /*
-  grob-info.hh -- declare Grob_info
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef STAFFELEMINFO_HH
@@ -21,6 +32,7 @@ class Grob_info
   Translator *origin_trans_;
   Grob *grob_;
   Direction start_end_;
+
   
   friend class Engraver;
 public:
@@ -37,6 +49,15 @@ public:
 
   Item *item () const;
   Spanner *spanner () const;
+  static bool less (Grob_info i, Grob_info j);
+
+  /*
+    For contexts that change staves, it may be desirable to emit a
+    grob into a staff other than the current one.  If this is non-null,
+    this grob should be announced in this context instead of the
+    daddy_context_.
+  */
+  Context *rerouting_daddy_context_;
 };
 
 #endif // STAFFELEMINFO_HH