release commit

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 0278fb7439ae5acbb88d8983024bcb944095459a..044908680ce58da9a0c7cc65d7ecba694cb1b237 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,23 +3,37 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--2003 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"
+#include "context.hh"
+#include "score-context.hh"
+
+Engraver_group_engraver*
+Engraver::get_daddy_engraver () const
+{
+  return dynamic_cast<Engraver_group_engraver*> (get_daddy_translator ());
+}
 
 void
 Engraver::announce_grob (Grob_info inf)
 {
-  get_daddy_grav ()->announce_grob (inf);
+  get_daddy_engraver ()->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 +41,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);
+    e->set_property ("cause", cause);
 
-  Grob_info i (e);
+  Grob_info i;
+  i.grob_ = e;
   if (!i.origin_trans_)
     i.origin_trans_ = this;
-  get_daddy_grav ()->announce_grob (i);
+
+  Engraver * g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
 
@@ -42,36 +59,27 @@ Engraver::announce_grob (Grob* e, SCM cause)
 void
 Engraver::typeset_grob (Grob*p)
 {
-  get_daddy_grav ()->typeset_grob (p);
+  Engraver *dad = get_daddy_engraver ();
+  if (dad)
+    dad->typeset_grob (p);
 }
 
 
-Engraver_group_engraver*
-Engraver::get_daddy_grav () const
-{
-  return (daddy_trans_)
-       ? dynamic_cast<Engraver_group_engraver *> (daddy_trans_)
-       : 0;
-}
 
-void
-Engraver::process_music ()
-{
-  
-}
-
-Engraver::Engraver()
+Engraver::Engraver ()
 {
 }
 
 
 Score_engraver* 
-Engraver::top_engraver () const
+Engraver::get_score_engraver () const
 {
-  return dynamic_cast<Score_engraver*> (top_translator());
+  SCM t = get_score_context ()->implementation_;
+  return dynamic_cast<Score_engraver*> (unsmob_translator (t));
 }
 
-ENTER_DESCRIPTION(Engraver,
+
+ENTER_DESCRIPTION (Engraver,
                   "", "",
                  "",
                  "", "", "");