* lily/staff-symbol-engraver.cc (acknowledge_grob): remove item ->

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 76f2a122bfb897dcc14c3ab06fa2e32ac404a5e1..1535a245cc1408d8235e8cd90ca065e3f081de1b 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -25,10 +25,6 @@ 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);
   /*
     take note of item/spanner
     put item in spanner. Adjust local key; etc.
@@ -42,14 +38,16 @@ protected:
      
    */
   virtual void process_acknowledged_grobs () {}
-  /**
-    Announce element. Default: pass on to daddy. Utility
-    */
-  virtual void announce_grob (Grob*, SCM cause);
+
   virtual void announce_grob (Grob_info);
   Engraver_group_engraver*get_daddy_engraver () const;
 
 public:
+  /**
+    Announce element. Default: pass on to daddy. Utility
+    */
+  void announce_grob (Grob*, SCM cause);
+  
   Score_engraver * get_score_engraver () const;
   /**
     override other ctor
@@ -57,10 +55,10 @@ public:
   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);
+#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);