X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver-group.hh;h=6bdb9143140781683eee398792a0f33aeaf3b06e;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=52d931b523b6db31dc053246d9f349945506b617;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 52d931b523..6bdb914314 100644
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.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
@@ -23,23 +23,38 @@
 #include "engraver.hh"
 #include "translator-group.hh"
 
-class Engraver_group : public virtual Translator_group
+class Announce_grob_info : public Grob_info
 {
-protected:
-  vector<Grob_info> announce_infos_;
-  Drul_array<SCM> acknowledge_hash_table_drul_;
-  DECLARE_LISTENER (override);
-  DECLARE_LISTENER (revert);
+  Direction start_end_;
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group);
+  Announce_grob_info (Grob_info gi, Direction start_end)
+    : Grob_info (gi), start_end_ (start_end)
+  { }
+  Direction start_end () const { return start_end_; }
+};
+
+struct Preinit_Engraver_group
+{
+  Drul_array<SCM> acknowledge_hash_table_drul_;
+  Preinit_Engraver_group ();
+};
 
+class Engraver_group : Preinit_Engraver_group, public Translator_group
+{
+protected:
+  vector<Announce_grob_info> announce_infos_;
+  void override (SCM);
+  void revert (SCM);
+public:
+  DECLARE_CLASSNAME (Engraver_group);
   Engraver_group ();
   virtual void derived_mark () const;
   void do_announces ();
   virtual void connect_to_context (Context *c);
   virtual void disconnect_from_context ();
-  virtual void announce_grob (Grob_info);
-  int pending_grob_count () const;
+  virtual void announce_grob (Grob_info, Direction start_end,
+                              Context *reroute_context = 0);
+  bool pending_grobs () const;
 private:
   virtual void acknowledge_grobs ();
 };