* lily/include/grob-info.hh: origin_contexts() now does not

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 279b60511c0113ab9d15f1564c649dba18a82181..b7dcefb83f44ca782f5a717f1d8a03053f7b6847 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,13 +12,13 @@
 
 #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 {
@@ -28,7 +28,7 @@ protected:
   /*
     Call this when you're finished with ELEM_P.
    */
-  virtual void typeset_grob (Grob*elem_p);
+  virtual void typeset_grob (Grob*elem);
   /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
@@ -41,21 +41,30 @@ protected:
      be looped with acknowledge_grob.
      
    */
-  virtual void create_grobs () {}
+  virtual void process_acknowledged_grobs () {}
   /**
     Announce element. Default: pass on to daddy. Utility
     */
-  virtual void announce_grob (Grob*, Music*);
+  virtual void announce_grob (Grob*, SCM cause);
   virtual void announce_grob (Grob_info);
   virtual void process_music ();
+  virtual void do_announces ();
+  Engraver_group_engraver*get_daddy_engraver () const;
+
 public:
-  Engraver_group_engraver * daddy_grav_l () const;
+  Score_engraver * get_score_engraver () const;
   /**
     override other ctor
    */
   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