X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=ffff8c41aa8dd3a027fb4ada53e8afe1ee5d1965;hb=21f6ea846dc1930cb41f185485ce6e1c8d9b30bd;hp=f3847c528efb1151e34ec6ceb23df7a91ac9abfc;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index f3847c528e..ffff8c41aa 100644
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -1,36 +1,44 @@
 /*
-  score-engraver.hh -- declare Score_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SCORE_ENGRAVER_HH
 #define SCORE_ENGRAVER_HH
 
-#include "engraver-group-engraver.hh"
-#include "score-translator.hh"
+#include "engraver-group.hh"
 
-class Score_engraver : public virtual Score_translator,
-		       public virtual Engraver_group_engraver
+class Score_engraver : public Engraver_group
 {
   System *system_;
 
-  Link_array<Grob> elems_;
+  vector<Grob *> elems_;
   Paper_score *pscore_;
 
   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);
@@ -38,13 +46,11 @@ protected:
 
   /*
     Translator interface
-   */
+  */
   virtual void derived_mark () const;
 
 public:
   Score_engraver ();
-  void forbid_breaks ();
-  virtual SCM get_output ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */