* scm/define-music-types.scm (music-descriptions): remove

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

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 76571145367474c2e03ba6d68168656967222f8c..d2de464f6004b8cfa9c18000eb6801a346f382be 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -10,10 +10,8 @@
 #define SCORE_ENGRAVER_HH
 
 #include "engraver-group.hh"
-#include "score-translator.hh"
 
-class Score_engraver : public virtual Score_translator,
-                      public virtual Engraver_group
+class Score_engraver : public Engraver_group
 {
   System *system_;
 
@@ -23,13 +21,13 @@ class Score_engraver : public virtual Score_translator,
   void typeset_all ();
 
 protected:
-  /* Score_translator */
-  virtual void finish ();
-  virtual void prepare (Moment);
-  virtual void one_time_step ();
+  DECLARE_LISTENER (finish);
+  DECLARE_LISTENER (prepare);
+  DECLARE_LISTENER (one_time_step);
 
   /* Engraver_group_engraver interface */
-  virtual bool try_music (Music *);
+  virtual void connect_to_context (Context *);
+  virtual void disconnect_from_context ();
   virtual void initialize ();
   virtual void finalize ();
   virtual void announce_grob (Grob_info);
@@ -42,7 +40,6 @@ protected:
 
 public:
   Score_engraver ();
-  virtual SCM get_output ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */