X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=c65c5980bceeaf88a22e0bfbfd65ce93f345cfd9;hb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;hp=76571145367474c2e03ba6d68168656967222f8c;hpb=e03b2923c10e1c33238a4f2ecf78714bf829e758;p=lilypond.git diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index 7657114536..c65c5980bc 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -3,17 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #ifndef SCORE_ENGRAVER_HH #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 */