(interface-doc): prune Grob

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 449ebd0ce07aa8882d9dea3b563e351d7d7cec8f..d8338972c935267add9cf1a438bc8a0f00c4d93d 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,23 +3,28 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music.hh"
 #include "engraver.hh"
 #include "engraver-group-engraver.hh"
 #include "grob.hh"
-#include "main.hh"
 #include "score-engraver.hh"
 #include "warn.hh"
+#include "spanner.hh"
+#include "item.hh"
 
 void
 Engraver::announce_grob (Grob_info inf)
 {
-  daddy_grav_l ()->announce_grob (inf);
+  get_daddy_grav ()->announce_grob (inf);
 }
 
+/*
+  CAUSE is the object (typically a Music object)  that
+  was the reason for making E.
+ */
 void
 Engraver::announce_grob (Grob* e, SCM cause)
 {
@@ -27,14 +32,17 @@ Engraver::announce_grob (Grob* e, SCM cause)
     TODO: junk grob-info, and make a cause grob-property to store
     `causes' generically.
   */
-  
   if (unsmob_music (cause) || unsmob_grob (cause))
     e->set_grob_property ("cause", cause);
 
-  Grob_info i (e);
-  if (!i.origin_trans_l_)
-    i.origin_trans_l_ = this;
-  daddy_grav_l ()->announce_grob (i);
+  Grob_info i;
+  i.grob_ = e;
+  if (!i.origin_trans_)
+    i.origin_trans_ = this;
+
+
+
+  get_daddy_grav ()->announce_grob (i);
 }
 
 
@@ -42,15 +50,15 @@ Engraver::announce_grob (Grob* e, SCM cause)
 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;
 }
 
@@ -59,7 +67,6 @@ Engraver::process_music ()
 {
   
 }
-
 Engraver::Engraver()
 {
 }
@@ -68,19 +75,11 @@ 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,
-                  "", "", "", "", "");
+                  "", "",
+                 "",
+                 "", "", "");