X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver.cc;h=b7bc326c1506e23763cce11847ed3c1c94f6f815;hb=28240aceaab110b424d8e37cb8024ad5f815d57f;hp=22a70a68070b6486e2014b7b5ce0c57a03bea13a;hpb=c5f04d22f8ad2b8735c6cfec69b8138f185752af;p=lilypond.git

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 22a70a6807..b7bc326c15 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,80 +3,61 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 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 "music.hh"
 #include "score-engraver.hh"
 #include "warn.hh"
+#include "spanner.hh"
+#include "item.hh"
+#include "context.hh"
+#include "score-context.hh"
+#include "lilypond-key.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)
+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_)
-    i.origin_trans_ = this;
-  get_daddy_grav ()->announce_grob (i);
-}
+    e->set_property ("cause", cause);
 
+  Grob_info i (this, e);
 
- 
-void
-Engraver::typeset_grob (Grob*p)
-{
-  get_daddy_grav ()->typeset_grob (p);
+  Engraver *g = get_daddy_engraver ();
+  if (g)
+    g->announce_grob (i);
 }
 
-
-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
+Score_engraver *
+Engraver::get_score_engraver () const
 {
-  return dynamic_cast<Score_engraver*> (top_translator());
+  return dynamic_cast<Score_engraver *> (get_score_context ()->implementation ());
 }
 
-ENTER_DESCRIPTION(Engraver,
-		   "", "",
-		  "",
-		  "", "", "");
+ADD_TRANSLATOR (Engraver,
+		"", "",
+		"",
+		"", "", "");