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

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index 815f04c05e..b52f589f93 100644
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -1,60 +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--2001 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_GRAV_HH
-#define SCORE_GRAV_HH
+#ifndef SCORE_ENGRAVER_HH
+#define SCORE_ENGRAVER_HH
 
-#include "engraver-group-engraver.hh"
-#include "global-translator.hh"
+#include "engraver-group.hh"
 
-/**
-  Top level engraver. Puts elements into appropriate columns.
- */
-class Score_engraver : 
-  public Engraver_group_engraver, public Global_translator 
+class Score_engraver : public Engraver_group
 {
-  Line_of_score * scoreline_l_;
-  int breaks_i_;
-
-  Link_array<Grob> elem_p_arr_;
-    
-  Paper_column* command_column_l_;
-  Paper_column* musical_column_l_;
-  void make_columns ();
-  void set_columns (Paper_column*,Paper_column*);
+  System *system_;
+
+  vector<Grob *> elems_;
+  Paper_score *pscore_;
+
   void typeset_all ();
-    
-public:
-  VIRTUAL_COPY_CONS (Translator);
-  Paper_score * pscore_p_;
-  
-  void forbid_breaks ();
-  Score_engraver ();
-  virtual Music_output *get_output_p ();  
-protected:   
-  virtual void prepare (Moment);
-  virtual void finish ();
-  virtual void one_time_step ();
-  virtual int depth_i () const { return Global_translator::depth_i ();}
 
 protected:
-  /* Engraver_group_engraver interface */
+  DECLARE_LISTENER (finish);
+  DECLARE_LISTENER (prepare);
+  DECLARE_LISTENER (one_time_step);
 
-  virtual bool try_music (Music*);
+  /* Engraver_group_engraver interface */
+  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 do_announces ();
-  virtual void typeset_grob (Grob*elem_p);
+  void stop_translation_timestep ();
 
-  virtual void stop_translation_timestep ();
+  /*
+    Translator interface
+  */
+  virtual void derived_mark () const;
 
+public:
+  Score_engraver ();
 };
 
-#endif // SCORE_GRAV_HH
+#endif /* SCORE_ENGRAVER_HH */