X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver.hh;h=1535a245cc1408d8235e8cd90ca065e3f081de1b;hb=1c5b28defa29c019a3d2038bf4b19ed215ec2d87;hp=729c5d7d577902737d76349e3430b2b3a530aeee;hpb=7367bac15e22b0b2ae9a1a0a7f849860f9d66f45;p=lilypond.git

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 729c5d7d57..1535a245cc 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,23 +12,19 @@
 
 #include "lily-proto.hh"
 #include "array.hh"
-#include "request.hh"
+#include "event.hh"
 #include "grob-info.hh"
 #include "translator.hh"
 
 
 /**
-  a struct which processes requests, and creates the #Grob#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:
-  /*
-    Call this when you're finished with ELEM_P.
-   */
-  virtual void typeset_grob (Grob*elem_p);
   /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
@@ -41,22 +37,30 @@ protected:
      be looped with acknowledge_grob.
      
    */
-  virtual void create_grobs () {}
+  virtual void process_acknowledged_grobs () {}
+
+  virtual void announce_grob (Grob_info);
+  Engraver_group_engraver*get_daddy_engraver () const;
+
+public:
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_grob (Grob*, Music*);
-  virtual void announce_grob (Grob_info);
-  virtual void process_music ();
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Engraver_group_engraver * daddy_grav_l() const;
+  void announce_grob (Grob*, SCM cause);
+  
+  Score_engraver * get_score_engraver () const;
   /**
     override other ctor
    */
-  Engraver () {}
+  TRANSLATOR_DECLARATIONS(Engraver);
 };
 
+#define make_item(x,cause) make_item_from_properties (this, ly_symbol2scm (x), cause)
+#define make_spanner(x,cause) make_spanner_from_properties (this, ly_symbol2scm (x), cause)
+Item* make_item_from_properties (Translator * tg, SCM x, SCM cause);
+Spanner* make_spanner_from_properties (Translator * tg, SCM x, SCM cause);
 
-#endif // ENGRAVER_HH
 
+
+
+#endif // ENGRAVER_HH