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

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

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 5ad3d5701e36fa6525fd422d017dcdd19528662a..62af8f32562a8864ceb500b69838111eb1dac592 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -8,7 +8,6 @@
 
 #include "context.hh"
 #include "grob-info.hh"
-#include "grob.hh"
 #include "item.hh"
 #include "music.hh"
 #include "spanner.hh"
@@ -29,24 +28,6 @@ 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
 {
@@ -97,25 +78,3 @@ Grob_info::ultimate_event_cause () const
     }
   return unsmob_stream_event (cause);
 }
-
-/*
-ES TODO: Junk this when no more engraver uses try_music
-*/
-Music *
-Grob_info::ultimate_music_cause () const
-{
-  SCM cause = grob_->self_scm ();
-  while (unsmob_grob (cause))
-    {
-      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"));
-    }
-}