patch::: 1.3.108.jcn1

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index a8086af1f556cc3d09b79d9b6bff25830c0e4dd4..3e768cdbf1678e23288b4c7baf8232fe1c1ea426 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@cs.uu.nl>
+  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -14,30 +14,25 @@
 #include "array.hh"
 #include "request.hh"
 #include "score-element-info.hh"
-#include "staff-info.hh"
 #include "translator.hh"
 
 
 /**
   a struct which processes requests, and creates the #Score_element#s.
-  It may use derived classes. Hungarian postfix: grav
-  
+  It may use derived classes. 
   */
 class Engraver : public virtual Translator {
     
   friend class Engraver_group_engraver;
-
 protected:
-    
-
   /// utility
-  Paper_def * paper() const;
-  /**
-    Invoke walker method to typeset element. Default: pass on to daddy.
-    */
+  Paper_def * paper_l() const;
+
+  /*
+    Call this last thing.
+   */
   virtual void typeset_element (Score_element*elem_p);
-    
-  /**
+  /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
 
@@ -53,24 +48,15 @@ protected:
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_element (Score_element_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*, Music*);
+  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 * access_Engraver () { return this; }
 };