Issue 4997/5: Use Preinit in Engraver_group

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

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index aa3cd478bce652c5bc6a098e0250be689a38d0f0..367b6a8f4cd244772c691d4d6e9dc762356a2474 100644 (file)
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -23,21 +23,33 @@
 #include "engraver.hh"
 #include "translator-group.hh"
 
-class Engraver_group : public Translator_group
+class Announce_grob_info : public Grob_info
+{
+  Direction start_end_;
+public:
+  Announce_grob_info (Grob_info gi, Direction start_end)
+    : Grob_info (gi), start_end_ (start_end)
+  { }
+  Direction start_end () const { return start_end_; }
+};
+
+class Engraver_group : public Preinit<Engraver_group>, public Translator_group
 {
 protected:
-  vector<Grob_info> announce_infos_;
+  vector<Announce_grob_info> announce_infos_;
   Drul_array<SCM> acknowledge_hash_table_drul_;
   void override (SCM);
   void revert (SCM);
 public:
   DECLARE_CLASSNAME (Engraver_group);
+  void pre_init ();
   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);
+  virtual void announce_grob (Grob_info, Direction start_end,
+                              Context *reroute_context = 0);
   bool pending_grobs () const;
 private:
   virtual void acknowledge_grobs ();