release commit

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 201f44655f009da118ce1d05c38a272f45237baa..044908680ce58da9a0c7cc65d7ecba694cb1b237 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -42,14 +42,16 @@ Engraver::announce_grob (Grob* e, SCM cause)
     `causes' generically.
   */
   if (unsmob_music (cause) || unsmob_grob (cause))
-    e->set_grob_property ("cause", cause);
+    e->set_property ("cause", cause);
 
   Grob_info i;
   i.grob_ = e;
   if (!i.origin_trans_)
     i.origin_trans_ = this;
 
-  get_daddy_engraver ()->announce_grob (i);
+  Engraver * g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
@@ -58,17 +60,13 @@ void
 Engraver::typeset_grob (Grob*p)
 {
   Engraver *dad = get_daddy_engraver ();
-  dad->typeset_grob (p);
+  if (dad)
+    dad->typeset_grob (p);
 }
 
 
 
-void
-Engraver::process_music ()
-{
-  
-}
-Engraver::Engraver()
+Engraver::Engraver ()
 {
 }
 
@@ -81,12 +79,7 @@ Engraver::get_score_engraver () const
 }
 
 
-void
-Engraver::do_announces ()
-{
-}
-
-ENTER_DESCRIPTION(Engraver,
+ENTER_DESCRIPTION (Engraver,
                   "", "",
                  "",
                  "", "", "");