Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh
index 4ebc0b2999ac38bb6e83752db4c2810f7605bb35..01ae110b376fb2642804bc70951138fc8a3b4aee 100644 (file)
--- a/lily/include/grob-info.hh
+++ b/lily/include/grob-info.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STAFFELEMINFO_HH
@@ -11,22 +11,32 @@
 
 #include "lily-guile.hh"
 #include "lily-proto.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 
 /*
   Data container for broadcasts.
 */
-struct Grob_info
+class Grob_info
 {
   Translator *origin_trans_;
-  friend class Engraver;
-
   Grob *grob_;
-
+  Direction start_end_;
+  
+  friend class Engraver;
 public:
-  Music *music_cause ();
-  Link_array<Context> origin_contexts (Translator *) const;
+  Direction start_end () const { return start_end_; }
+  Grob *grob () const { return grob_; }
+  Translator *origin_translator () const { return origin_trans_; }
+
+  Context *context () 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;
 };
 
 #endif // STAFFELEMINFO_HH