X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=76f2a122bfb897dcc14c3ab06fa2e32ac404a5e1;hb=58285d9a44003dc28d5183daa5c1ae71249440e5;hp=a073d808ac5fa300ee018ab3ded0bac738a5940f;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index a073d808ac..76f2a122bf 100644
--- 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,67 +12,57 @@
 
 #include "lily-proto.hh"
 #include "array.hh"
-#include "request.hh"
-#include "score-element-info.hh"
-#include "staff-info.hh"
+#include "event.hh"
+#include "grob-info.hh"
 #include "translator.hh"
 
 
 /**
-  a struct which processes requests, and creates the #Score_element#s.
-  It may use derived classes. Hungarian postfix: grav
-  
+  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;
-  /**
-    Invoke walker method to typeset element. Default: pass on to daddy.
-    */
-  virtual void typeset_element (Score_element*elem_p);
-
-    
-  /**
+  /*
+    Call this when you're finished with 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_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_grob (Grob*, SCM cause);
+  virtual void announce_grob (Grob_info);
+  Engraver_group_engraver*get_daddy_engraver () const;
 
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  Engraver_group_engraver * daddy_grav_l() const;
+  Score_engraver * get_score_engraver () const;
   /**
     override other ctor
    */
-  Engraver () {}
-
-  
+  TRANSLATOR_DECLARATIONS(Engraver);
 };
 
+#define make_item(x) make_item_from_properties (daddy_context_, ly_symbol2scm (x))
+#define make_spanner(x) make_spanner_from_properties (daddy_context_, ly_symbol2scm (x))
+Item* make_item_from_properties (Context * tg, SCM x);
+Spanner* make_spanner_from_properties (Context * tg, SCM x);
+
 
-#endif // ENGRAVER_HH
 
+
+#endif // ENGRAVER_HH