X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-collecting-engraver.cc;h=af4d5e04f08bb7ee9b9a8289245b965ed7dd511a;hb=cb1903a33752ef4c1a4f4bc86e307770e45aa4f5;hp=5d3e154baba54c9fa6edfe60e9bc0f6cf3205c20;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index 5d3e154bab..af4d5e04f0 100644
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -1,11 +1,10 @@
-/*   
-staff-collecting-engraver.cc --  implement Staff_collecting_engraver
+/*
+  staff-collecting-engraver.cc -- implement Staff_collecting_engraver
 
-source file of the GNU LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-(c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "staff-symbol.hh"
 #include "engraver.hh"
@@ -16,32 +15,40 @@ class Staff_collecting_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Staff_collecting_engraver);
-  virtual void acknowledge_grob (Grob_info);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
+  DECLARE_END_ACKNOWLEDGER (staff_symbol);
 };
 
 Staff_collecting_engraver::Staff_collecting_engraver ()
 {
-  
 }
 
 void
-Staff_collecting_engraver::acknowledge_grob (Grob_info gi)
+Staff_collecting_engraver::acknowledge_staff_symbol (Grob_info gi)
 {
-  if (Staff_symbol::has_interface (gi.grob_))
-    {
-      SCM staffs = get_property ("stavesFound");
-      staffs = scm_cons (gi.grob_->self_scm (), staffs);
+  SCM staffs = get_property ("stavesFound");
+  staffs = scm_cons (gi.grob ()->self_scm (), staffs);
 
-      context ()->set_property ("stavesFound", staffs);
-    }
+  context ()->set_property ("stavesFound", staffs);
 }
 
+void
+Staff_collecting_engraver::acknowledge_end_staff_symbol (Grob_info gi)
+{
+  SCM staffs = get_property ("stavesFound");
+  staffs = scm_delq (gi.grob ()->self_scm (), staffs);
+
+  context ()->set_property ("stavesFound", staffs);
+}
+
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Staff_collecting_engraver, staff_symbol);
+ADD_END_ACKNOWLEDGER (Staff_collecting_engraver, staff_symbol);
 
 ADD_TRANSLATOR (Staff_collecting_engraver,
-/* descr */       "Maintain the stavesFound variable",
+		/* doc */ "Maintain the stavesFound variable",
 
-/* creats*/       "",
-/* accepts */     "",
-/* acks  */      "staff-symbol-interface",
-/* reads */       "stavesFound",
-/* write */       "stavesFound");
+		/* create */ "",
+		/* read */ "stavesFound",
+		/* write */ "stavesFound");