Run `make grand-replace'.

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

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index a8f3f4c7b1c5320b1cfa34a2ddb9381fee193c5a..be6fd79e17a290f57ca4a206b018a1710f89d259 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -3,22 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 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 ()
@@ -28,11 +33,11 @@ Grob_info::Grob_info ()
   origin_trans_ = 0;
 }
 
-Music *
-Grob_info::music_cause () const
+Stream_event *
+Grob_info::event_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return unsmob_music (cause);
+  return unsmob_stream_event (cause);
 }
 
 vector<Context*>
@@ -68,15 +73,13 @@ Grob_info::item () const
   return dynamic_cast<Item *> (grob_);
 }
 
-Music *
-Grob_info::ultimate_music_cause () const
+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_music (cause);
+  return unsmob_stream_event (cause);
 }
-