* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 55929a854b0ac2498c13a9777313502773dbe37f..b8cb0f493949df5cbe3c96158c75ca7a0989e79b 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -17,27 +17,24 @@
 void
 Engraver::announce_grob (Grob_info inf)
 {
-  daddy_grav_l ()->announce_grob (inf);
+  get_daddy_grav ()->announce_grob (inf);
 }
 
 void
-Engraver::announce_grob (Grob* e, Music *m)
+Engraver::announce_grob (Grob* e, SCM cause)
 {
   /*
     TODO: junk grob-info, and make a cause grob-property to store
     `causes' generically.
   */
   
-  if (m && store_locations_global_b 
-      && m->origin ()->location_str ().length_i ())
-    {
-      e->set_grob_property ("origin", m->get_mus_property ("origin"));
-    }
-  
-  Grob_info i (e, m ? m->self_scm () : SCM_UNDEFINED);
-  if (!i.origin_trans_l_)
-    i.origin_trans_l_ = this;
-  daddy_grav_l ()->announce_grob (i);
+  if (unsmob_music (cause) || unsmob_grob (cause))
+    e->set_grob_property ("cause", cause);
+
+  Grob_info i (e);
+  if (!i.origin_trans_)
+    i.origin_trans_ = this;
+  get_daddy_grav ()->announce_grob (i);
 }
 
 
@@ -45,15 +42,15 @@ Engraver::announce_grob (Grob* e, Music *m)
 void
 Engraver::typeset_grob (Grob*p)
 {
-  daddy_grav_l ()->typeset_grob (p);
+  get_daddy_grav ()->typeset_grob (p);
 }
 
 
 Engraver_group_engraver*
-Engraver::daddy_grav_l () const
+Engraver::get_daddy_grav () const
 {
-  return (daddy_trans_l_)
-       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_l_)
+  return (daddy_trans_)
+       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_)
        : 0;
 }
 
@@ -71,17 +68,7 @@ Engraver::Engraver()
 Score_engraver* 
 Engraver::top_engraver () const
 {
-  /*
-    ugh.
-   */
-  if (dynamic_cast<Score_engraver*>((Engraver*)this))
-    return dynamic_cast<Score_engraver*> ((Engraver*)this);
-
-  if (daddy_trans_l_)
-    return dynamic_cast<Engraver*> (daddy_trans_l_)->top_engraver ();
-
-  programming_error ("No score engraver!");
-  return 0;
+  return dynamic_cast<Score_engraver*> (top_translator());
 }
 
 ENTER_DESCRIPTION(Engraver,