Fix cross-staff thinko.

[lilypond.git] / lily / grob-info.cc

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 161fe778e59af089b04c53b022645667fa2d1aae..68ca9f38802add8d629bbe5c56177a047a2f591f 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -3,45 +3,51 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "context.hh"
 #include "grob-info.hh"
-#include "grob.hh"
+#include "item.hh"
 #include "music.hh"
-#include "translator-group.hh"
-#include "context.hh"
 #include "spanner.hh"
-#include "item.hh"
-
+#include "stream-event.hh"
+#include "translator-group.hh"
 
 Grob_info::Grob_info (Translator *t, Grob *g)
 {
   origin_trans_ = t;
   grob_ = g;
+  start_end_ = START;
+
+  /*
+    assert here, because this is easier to debug.
+  */
+  assert (g);
 }
 
 Grob_info::Grob_info ()
 {
   grob_ = 0;
+  start_end_ = START;
   origin_trans_ = 0;
 }
 
-Music *
-Grob_info::music_cause ()
+Stream_event *
+Grob_info::event_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return unsmob_music (cause);
+  return unsmob_stream_event (cause);
 }
 
-Link_array<Context>
+vector<Context*>
 Grob_info::origin_contexts (Translator *end) const
 {
   Context *t = origin_trans_->context ();
-  Link_array<Context> r;
+  vector<Context*> r;
   do
     {
-      r.push (t);
+      r.push_back (t);
       t = t->get_parent_context ();
     }
   while (t && t != end->context ());
@@ -49,21 +55,31 @@ Grob_info::origin_contexts (Translator *end) const
   return r;
 }
 
-
-Context*
+Context *
 Grob_info::context () const
 {
   return origin_trans_->context ();
 }
 
-Spanner*
+Spanner *
 Grob_info::spanner () const
 {
-  return dynamic_cast<Spanner*> (grob_);
+  return dynamic_cast<Spanner *> (grob_);
 }
 
-Item*
+Item *
 Grob_info::item () const
 {
-  return dynamic_cast<Item*> (grob_);
+  return dynamic_cast<Item *> (grob_);
+}
+
+Stream_event *
+Grob_info::ultimate_event_cause () const
+{
+  SCM cause = grob_->self_scm ();
+  while (unsmob_grob (cause))
+    {
+      cause = unsmob_grob (cause)->get_property ("cause");
+    }
+  return unsmob_stream_event (cause);
 }