* The grand 2005-2006 replace.

[lilypond.git] / lily / engraver.cc

diff --git a/lily/engraver.cc b/lily/engraver.cc
index c2854e0330af4af32782593f7a9ce9fa2a6d7841..b756d742dcad8c2d829729c84b55e297738e6c98 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -3,13 +3,12 @@
 
   Sourcefile of GNU LilyPond music type setter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "music.hh"
 #include "engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "grob.hh"
+
+#include "music.hh"
 #include "score-engraver.hh"
 #include "warn.hh"
 #include "spanner.hh"
@@ -18,10 +17,10 @@
 #include "score-context.hh"
 #include "lilypond-key.hh"
 
-Engraver_group_engraver*
+Engraver_group *
 Engraver::get_daddy_engraver () const
 {
-  return dynamic_cast<Engraver_group_engraver*> (get_daddy_translator ());
+  return dynamic_cast<Engraver_group *> (get_daddy_translator ());
 }
 
 void
@@ -30,56 +29,39 @@ Engraver::announce_grob (Grob_info 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)
 {
   if (unsmob_music (cause) || unsmob_grob (cause))
     e->set_property ("cause", cause);
 
-  Grob_info i;
-  i.grob_ = e;
-  if (!i.origin_trans_)
-    i.origin_trans_ = this;
+  Grob_info i (this, e);
 
-  Engraver * g = get_daddy_engraver ();
+  Engraver_group *g = get_daddy_engraver ();
   if (g)
     g->announce_grob (i);
 }
 
-
- 
-
-
 Engraver::Engraver ()
 {
 }
 
-
-Score_engraver* 
+Score_engraver *
 Engraver::get_score_engraver () const
 {
-  return dynamic_cast<Score_engraver*> (get_score_context ()->implementation ());
-}
-
-
-Object_key const*
-Engraver::get_grob_key (String name) const
-{
-  Object_key * k = new Lilypond_grob_key (context()->get_key(),
-                                         now_mom(),
-                                         name);
-
-  return k;                                      
+  return dynamic_cast<Score_engraver *> (get_score_context ()->implementation ());
 }
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION (Engraver,
-                  "", "",
-                 "",
-                 "", "", "");
+ADD_TRANSLATOR (Engraver,
+               "Base class for engravers. Does nothing, so it is not used.",
+               "",
+               "",
+               "",
+               "");