X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscore-engraver.hh;h=b52f589f933993d7662474970d31e88643d5d2a3;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=af67e0bebd167425bb1916f3f5f0b8840a0524a9;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index af67e0bebd..b52f589f93 100644
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -1,50 +1,56 @@
 /*
-  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--2015 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_;
-  int breaks_;			// used for stat printing
-  
-  Link_array<Grob> elems_;
-  Paper_column* command_column_;
-  Paper_column* musical_column_;
-  Paper_score * pscore_;
-
-  void make_columns ();
-  void set_columns (Paper_column*,Paper_column*);
+
+  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 void acknowledge_grob (Grob_info);
-  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);
-  virtual void stop_translation_timestep ();
+  void stop_translation_timestep ();
+
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
 
 public:
-  TRANSLATOR_DECLARATIONS(Score_engraver);
-  void forbid_breaks ();
-  virtual Music_output *get_output ();  
+  Score_engraver ();
 };
 
 #endif /* SCORE_ENGRAVER_HH */