release: 1.1.0

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index b0f466d3ddeabfb8529caacd4e968b7248e11c18..9dc6594c8eaaca34f5d98830806a7f7e850c57cc 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, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,15 +11,15 @@
 #define ENGRAVER_HH
 
 #include "lily-proto.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "request.hh"
-#include "score-elem-info.hh"
+#include "score-element-info.hh"
 #include "staff-info.hh"
 #include "translator.hh"
 
 
 /**
-  a struct which processes requests, and creates the #Score_elem#s.
+  a struct which processes requests, and creates the #Score_element#s.
   It may use derived classes. Hungarian postfix: grav
   
   */
@@ -35,7 +35,8 @@ protected:
   /**
     Invoke walker method to typeset element. Default: pass on to daddy.
     */
-  virtual void typeset_element (Score_elem*elem_p);
+  virtual void typeset_element (Score_element*elem_p);
+
     
   /**
     take note of item/spanner
@@ -43,11 +44,17 @@ protected:
 
     Default: ignore the info
     */
-  virtual void acknowledge_element (Score_elem_info) {}
+  virtual void acknowledge_element (Score_element_info) {}
+
+  /** Do things with stuff found in acknowledge_element. Ugh. Should
+     be looped with acknowledge_element.
+     
+   */
+  virtual void process_acknowledged () {}
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_element (Score_elem_info);
+  virtual void announce_element (Score_element_info);
    
   /**
     Get information on the staff. Default: ask daddy.
@@ -64,8 +71,7 @@ public:
   Engraver () {}
 
   DECLARE_MY_RUNTIME_TYPEINFO;
-  void print() const;
-  virtual Engraver * engraver_l () { return this; }
+  virtual Engraver * access_Engraver () { return this; }
 };