(SCM_VECTOR_P): Compile fix.

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

diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh
index ab0f38543c7c77056ae44b522f9f87167e9e7c43..53180f5f8b42de448258a45d57bbfd5259ea632a 100644 (file)
--- a/lily/include/engraver-group-engraver.hh
+++ b/lily/include/engraver-group-engraver.hh
@@ -4,31 +4,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef ENGRAVERGROUP_HH
 #define ENGRAVERGROUP_HH
 
-#include "lily-proto.hh"
-#include "parray.hh"
-#include "grob-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,
+class Engraver_group_engraver : public virtual Engraver,
                                public virtual Translator_group
 {
 protected:
-  Array<Grob_info> announce_info_arr_;
-
-  
+  Array<Grob_info> announce_infos_;
   
 public:
   TRANSLATOR_DECLARATIONS(Engraver_group_engraver);
@@ -36,12 +27,16 @@ public:
   virtual void initialize ();
   virtual void do_announces ();
   virtual void announce_grob (Grob_info);
-  virtual void process_music ();
+
+  int pending_grob_count () const;
 private:
   virtual void acknowledge_grobs ();
-  virtual void process_acknowledged_grobs_in_simple_children ();
 };
 
+typedef void (Engraver::*Engraver_method) (void);
+
+void engraver_each (SCM list, Engraver_method method);
+
 #endif // ENGRAVERGROUP_HH