* lily/bar-line.cc: Add documentation for "||:" also in the

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

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index bd8279e5f7d7b67c692d7c45dff78b357246478b..5ad3d5701e36fa6525fd422d017dcdd19528662a 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -6,31 +6,52 @@
   (c) 1997--2006 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;
 }
 
 Grob_info::Grob_info ()
 {
   grob_ = 0;
+  start_end_ = START;
   origin_trans_ = 0;
 }
 
+/* ES TODO: Junk this when no more engravers use try_music */
 Music *
 Grob_info::music_cause () const
 {
   SCM cause = grob_->get_property ("cause");
-  return unsmob_music (cause);
+
+  Music *ret = unsmob_music (cause);
+  if (ret)
+    return ret;
+  else
+    {
+      Stream_event *ev = unsmob_stream_event (cause);
+      if (!ev)
+       return 0;
+      return unsmob_music (ev->get_property ("music-cause"));
+    }
+}
+
+Stream_event *
+Grob_info::event_cause () const
+{
+  SCM cause = grob_->get_property ("cause");
+  return unsmob_stream_event (cause);
 }
 
 vector<Context*>
@@ -66,6 +87,20 @@ Grob_info::item () const
   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);
+}
+
+/*
+ES TODO: Junk this when no more engraver uses try_music
+*/
 Music *
 Grob_info::ultimate_music_cause () const
 {
@@ -75,6 +110,12 @@ Grob_info::ultimate_music_cause () const
       cause = unsmob_grob (cause)->get_property ("cause");
     }
 
-  return unsmob_music (cause);
+  Music *ret = unsmob_music (cause);
+  if (ret)
+    return ret;
+  else
+    {
+      Stream_event *ev = unsmob_stream_event (cause);
+      return unsmob_music (ev->get_property ("music-cause"));
+    }
 }
-