Run `make grand-replace'.

[lilypond.git] / lily / staff-collecting-engraver.cc

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index f9b97e4c67ff70b0dde52a9c8cc3a5721323ceac..3ecee7ba23f172f9e6eeb335cc1ac04580b852a7 100644 (file)
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol.hh"
@@ -15,7 +15,8 @@ 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 ()
@@ -23,22 +24,38 @@ 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 @code{stavesFound} variable.",
+
+               /* create */
+               "",
+
+               /* read */
+               "stavesFound ",
 
-               /* creats*/ "",
-               /* accepts */ "",
-               /* acks  */ "staff-symbol-interface",
-               /* reads */ "stavesFound",
-               /* write */ "stavesFound");
+               /* write */
+               "stavesFound "
+               );