Imported Upstream version 2.19.45

[lilypond.git] / lily / include / score-engraver.hh

diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh
index ffff8c41aa8dd3a027fb4ada53e8afe1ee5d1965..d0ec7821679d13da39e8e90dd9c3d6495ee4680d 100644 (file)
--- a/lily/include/score-engraver.hh
+++ b/lily/include/score-engraver.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -32,16 +32,16 @@ class Score_engraver : public Engraver_group
   void typeset_all ();
 
 protected:
-  DECLARE_LISTENER (finish);
-  DECLARE_LISTENER (prepare);
-  DECLARE_LISTENER (one_time_step);
+  void finish (SCM);
+  void prepare (SCM);
+  void one_time_step (SCM);
 
   /* 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 announce_grob (Grob_info, Direction dir, Context *reroute_context = 0);
   void stop_translation_timestep ();
 
   /*