X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fgrob-info.hh;h=1df88ce749f2de9204db3684c38bcf017367db34;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a8184b9b47eeedbca080a51b83812d3e9d7e5b69;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh
index a8184b9b47..1df88ce749 100644
--- a/lily/include/grob-info.hh
+++ b/lily/include/grob-info.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -32,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_; }
@@ -42,12 +42,21 @@ public:
   Context *context () const;
   Stream_event *event_cause () const;
   Stream_event *ultimate_event_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