Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 5ad3d5701e36fa6525fd422d017dcdd19528662a..a8f3f4c7b1c5320b1cfa34a2ddb9381fee193c5a 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -6,14 +6,13 @@
   (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 "spanner.hh"
-#include "stream-event.hh"
 #include "translator-group.hh"
+#include "context.hh"
+#include "spanner.hh"
+#include "item.hh"
 
 Grob_info::Grob_info (Translator *t, Grob *g)
 {
@@ -29,29 +28,11 @@ Grob_info::Grob_info ()
   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");
-
-  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);
+  return unsmob_music (cause);
 }
 
 vector<Context*>
@@ -87,20 +68,6 @@ 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
 {
@@ -110,12 +77,6 @@ Grob_info::ultimate_music_cause () const
       cause = unsmob_grob (cause)->get_property ("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"));
-    }
+  return unsmob_music (cause);
 }
+