Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 125021cdf6122e088bea994d61709be35aa3c1bb..d1df4cffb37c39008cb27d295c8289768ecbab72 100644 (file)
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -1,44 +1,38 @@
 /*
-  engraver-group.hh -- declare Engraver_group_engraver
+  engraver-group.hh -- declare Engraver_group
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#ifndef ENGRAVER_GROUP_HH
+#define ENGRAVER_GROUP_HH
 
-#ifndef ENGRAVERGROUP_HH
-#define ENGRAVERGROUP_HH
-
-#include "lily-proto.hh"
-#include "parray.hh"
-#include "plist.hh"
-#include "score-elem-info.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_group
+class Engraver_group : public virtual Translator_group
 {
 protected:
-  Array<Score_elem_info> announce_info_arr_;
+  vector<Grob_info> announce_infos_;
+  Drul_array<SCM> acknowledge_hash_table_drul_;
+
 public:
-  TRANSLATOR_CLONE(Engraver_group_engraver);
-  Engraver_group_engraver();
-  ~Engraver_group_engraver();
-    
-  DECLARE_MY_RUNTIME_TYPEINFO;
-    
-  virtual Staff_info get_staff_info() const;
-  virtual void do_announces();
-  virtual void announce_element (Score_elem_info);
+  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group);
+  Engraver_group ();
+  virtual void derived_mark () const;
+  void do_announces ();
+  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 */