* lily/bar-line.cc (compound_barline): fix : for staff without

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

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index f0dce7d6c721e989d0184b37abf4b8155564e702..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,30 +38,29 @@ 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);
-  virtual void process_music ();
-
-  Score_engraver * top_engraver () const;
 
-  Item * internal_make_item (SCM);
-  Spanner * internal_make_spanner (SCM);
+  virtual void announce_grob (Grob_info);
+  Engraver_group_engraver*get_daddy_engraver () const;
 
 public:
-  Engraver_group_engraver * get_daddy_grav () const;
+  /**
+    Announce element. Default: pass on to daddy. Utility
+    */
+  void announce_grob (Grob*, SCM cause);
+  
+  Score_engraver * get_score_engraver () const;
   /**
     override other ctor
    */
   TRANSLATOR_DECLARATIONS(Engraver);
 };
 
-#define make_item(x) internal_make_item (ly_symbol2scm (x))
-#define make_spanner(x) internal_make_spanner (ly_symbol2scm (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);
 
 
 
-#endif // ENGRAVER_HH
 
+#endif // ENGRAVER_HH