Run `make grand-replace'.

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

diff --git a/lily/grob-info.cc b/lily/grob-info.cc
index 5ad3d5701e36fa6525fd422d017dcdd19528662a..be6fd79e17a290f57ca4a206b018a1710f89d259 100644 (file)
--- a/lily/grob-info.cc
+++ b/lily/grob-info.cc
@@ -3,12 +3,11 @@
 
   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 "spanner.hh"
@@ -20,6 +19,11 @@ 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 ()
@@ -29,24 +33,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 +83,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"));
-    }
-}