* Another grand 2003 update.

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 3e768cdbf1678e23288b4c7baf8232fe1c1ea426..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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,51 +12,50 @@
 
 #include "lily-proto.hh"
 #include "array.hh"
-#include "request.hh"
-#include "score-element-info.hh"
+#include "event.hh"
+#include "grob-info.hh"
 #include "translator.hh"
 
 
 /**
-  a struct which processes requests, and creates the #Score_element#s.
+  a struct which processes events, and creates the #Grob#s.
   It may use derived classes. 
   */
 class Engraver : public virtual Translator {
     
   friend class Engraver_group_engraver;
 protected:
-  /// utility
-  Paper_def * paper_l() const;
-
   /*
-    Call this last thing.
+    Call this when you're finished with ELEM_P.
    */
-  virtual void typeset_element (Score_element*elem_p);
+  virtual void typeset_grob (Grob*elem);
   /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
 
     Default: ignore the info
     */
-  virtual void acknowledge_element (Score_element_info) {}
+  virtual void acknowledge_grob (Grob_info) {}
 
-  /** Do things with stuff found in acknowledge_element. Ugh. Should
-     be looped with acknowledge_element.
+  /** Do things with stuff found in acknowledge_grob. Ugh. Should
+     be looped with acknowledge_grob.
      
    */
-  virtual void process_acknowledged () {}
+  virtual void process_acknowledged_grobs () {}
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_element (Score_element*, Music*);
-  virtual void announce_element (Score_element_info);  
+  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);
 };