X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fengraver-group.hh;h=bbb759b1ace6acbe03220b82087f934a619f0803;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=03e26c9610ab20ef96f6a57d75a4ede38c94671b;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 03e26c9610..bbb759b1ac 100644
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -1,90 +1,51 @@
 /*
-  engravergroup.hh -- declare Engraver_group_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 Han-Wen Nienhuys <hanwen@stack.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.
 
-#ifndef ENGRAVERGROUP_HH
-#define ENGRAVERGROUP_HH
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#include "lily-proto.hh"
-#include "parray.hh"
-#include "plist.hh"
-#include "score-elem-info.hh"
-#include "engraver.hh"
-#include "translator.hh"
+#ifndef ENGRAVER_GROUP_HH
+#define ENGRAVER_GROUP_HH
 
+#include "engraver.hh"
+#include "translator-group.hh"
 
-/**
-  Group a number of engravers. Usually delegates everything to its contents.
-  Postfix: group
-  */
-class Engraver_group_engraver : public Engraver, public virtual Translator {
+class Engraver_group : public Translator_group
+{
 protected:
-    Pointer_list<Engraver*> grav_list_;
-    Link_array<Engraver_group_engraver> group_l_arr_;
-    Link_array<Engraver> nongroup_l_arr_;
-    
-    Array<Score_elem_info> announce_info_arr_;
-    
-    virtual void do_print()const;
-    virtual bool removable_b()const;
+  vector<Grob_info> announce_infos_;
+  Drul_array<SCM> acknowledge_hash_table_drul_;
+  DECLARE_LISTENER (override);
+  DECLARE_LISTENER (revert);
 public:
-    Engraver*get_simple_engraver (char const*typeinfo)const;
-    virtual void print() const ;
-
-    Input_translator * itrans_l_;
-    void check_removal();
-    Engraver_group_engraver();
-    ~Engraver_group_engraver();
-    
-    bool is_bottom_engraver_b() const;
-
-    
-    /**
-      Junk #grav_l#.
-      Pre:
-      #grav_l# is in #grav_list_#
-     */
-    virtual void terminate_engraver (Engraver * grav_l);
-    
-    
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    
-    /**
-      Remove #grav_l# from the list, and return it.
-     */
-    virtual Engraver * remove_engraver_p (Engraver*grav_l);
-    virtual void set_feature (Feature i);
-    virtual void sync_features();
-
-    virtual void do_pre_move_processing();
-    virtual void do_post_move_processing();
-    virtual void do_removal_processing();
-    virtual bool do_try_request (Request*);
-    virtual bool try_request (Request*);
-    virtual void do_process_requests();
-
-    virtual Staff_info get_staff_info()const;
-    
-    virtual Engraver_group_engraver * find_engraver_l (String name,String id);
-    virtual void do_announces();    
-    virtual void announce_element (Score_elem_info);
-    virtual void add (Engraver* grav_p);
-    virtual bool contains_b (Engraver*)const;
-
-    virtual Translator* find_get_translator_l (String name, String id);
-    virtual Translator * get_default_interpreter();
-    /**
-      Go up in the tree. default: choose next parent
-     */
-    Translator * ancestor_l (int l=1);
-    int depth_i() const;
+  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;
+private:
+  virtual void acknowledge_grobs ();
 };
 
-#endif // ENGRAVERGROUP_HH
+typedef void (Engraver:: *Engraver_method) (void);
+
+void engraver_each (SCM list, Engraver_method method);
 
+#endif /* ENGRAVERGROUP_HH */