Issue 5024: Rework the Preinit framework into something simpler

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

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 2a75741f765faf2582d6d9ebf5789d147415e4b9..6bdb9143140781683eee398792a0f33aeaf3b06e 100644 (file)
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -1,9 +1,20 @@
 /*
-  engraver-group.hh -- declare Engraver_group
+  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--2008 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
+  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 ENGRAVER_GROUP_HH
@@ -12,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 ();
 };
@@ -39,4 +65,3 @@ void engraver_each (SCM list, Engraver_method method);
 
 #endif /* ENGRAVERGROUP_HH */
 
-