X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=52b652235315b4a86273cdfe1d8a294cd93c5b02;hb=87354fef0dcfb6014270d0311abfb45cc57d2726;hp=aa23392888653ddf553e11bfc94f75a93ab39bd3;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index aa23392888..52b6522353 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--2007 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,8 +40,6 @@ protected: public: Score_engraver (); - void forbid_breaks (); - virtual SCM get_output (); }; #endif /* SCORE_ENGRAVER_HH */