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

diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh
index c41d0686d0..1df88ce749 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--2015 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
@@ -11,7 +22,7 @@
 
 #include "lily-guile.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 
 /*
   Data container for broadcasts.
@@ -20,21 +31,32 @@ class Grob_info
 {
   Translator *origin_trans_;
   Grob *grob_;
+  Direction start_end_;
 
   friend class Engraver;
 public:
+  Direction start_end () const { return start_end_; }
   Grob *grob () const { return grob_; }
   Translator *origin_translator () const { return origin_trans_; }
 
   Context *context () const;
-  Music *music_cause () const;
-  Music *ultimate_music_cause () const;
-  Link_array<Context> origin_contexts (Translator *) const;
+  Stream_event *event_cause () const;
+  Stream_event *ultimate_event_cause () 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