* Another grand 2003 update.

[lilypond.git] / lily / include / engraver.hh

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 66475cd36eea32fad811029be76cf1cd5b0ea7d0..7c59e743f8c1b78883b7e982765d67f567f1bfbe 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,13 +12,13 @@
 
 #include "lily-proto.hh"
 #include "array.hh"
-#include "request.hh"
+#include "event.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
 
 /**
-  a struct which processes requests, and creates the #Grob#s.
+  a struct which processes events, and creates the #Grob#s.
   It may use derived classes. 
   */
 class Engraver : public virtual Translator {
@@ -28,7 +28,7 @@ protected:
   /*
     Call this when you're finished with ELEM_P.
    */
-  virtual void typeset_grob (Grob*elem_p);
+  virtual void typeset_grob (Grob*elem);
   /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
@@ -41,20 +41,21 @@ protected:
      be looped with acknowledge_grob.
      
    */
-  virtual void create_grobs () {}
+  virtual void process_acknowledged_grobs () {}
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_grob (Grob*, Music*);
+  virtual void announce_grob (Grob*, SCM cause);
   virtual void announce_grob (Grob_info);
   virtual void process_music ();
+
+  Score_engraver * top_engraver () const;
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Engraver_group_engraver * daddy_grav_l () const;
+  Engraver_group_engraver * get_daddy_grav () const;
   /**
     override other ctor
    */
-  Engraver () {}
+  TRANSLATOR_DECLARATIONS(Engraver);
 };