X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrob-info.hh;h=c62df2c20cfb090110d4877ce037147fb435b844;hb=29af9bda720e7624494abbacb9895ac7d63b5221;hp=ebd860ef3a82869ee156886d6678f994b22a7f73;hpb=eb51e9b3adf374a806fed1dda25d146974950123;p=lilypond.git

diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh
index ebd860ef3a..c62df2c20c 100644
--- 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--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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,7 +32,7 @@ class Grob_info
   Translator *origin_trans_;
   Grob *grob_;
   Direction start_end_;
-  
+
   friend class Engraver;
 public:
   Direction start_end () const { return start_end_; }
@@ -30,15 +41,22 @@ public:
 
   Context *context () const;
   Stream_event *event_cause () const;
-  Music *music_cause () const;
   Stream_event *ultimate_event_cause () const;
-  Music *ultimate_music_cause () const;
-  vector<Context*> origin_contexts (Translator *) const;
+  vector<Context *> origin_contexts (Translator *) const;
   Grob_info (Translator *, Grob *);
   Grob_info ();
 
   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