release: 1.3.65

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index f6b4f6bafa82b7cca2256b1f5e6cc1461a0a92d1..2fb91ecbfb01d005e20435ce57924ea7c6d24e2e 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--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996--2000 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
   
   */
@@ -31,11 +31,12 @@ protected:
     
 
   /// utility
-  Paper_def * paper() const;
+  Paper_def * paper_l() const;
   /**
     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,7 +44,7 @@ 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.
@@ -53,24 +54,16 @@ protected:
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_element (Score_elem_info);
-   
-  /**
-    Get information on the staff. Default: ask daddy.
-    */
-  virtual Staff_info get_staff_info() const;
-  virtual void fill_staff_info (Staff_info&);
-
+  virtual void announce_element (Score_element_info);
 public:
-  TRANSLATOR_CLONE(Engraver);
+  VIRTUAL_COPY_CONS(Translator);
   Engraver_group_engraver * daddy_grav_l() const;
   /**
     override other ctor
    */
   Engraver () {}
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  virtual Engraver * engraver_l () { return this; }
+  
 };