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 f885cc6149a3260f1e4c2347d359d4551e76ec21..3ecee7ba23f172f9e6eeb335cc1ac04580b852a7 100644 (file)
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -1,46 +1,61 @@
-/*   
-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--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
- */
 #include "staff-symbol.hh"
 #include "engraver.hh"
 #include "grob.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 class Staff_collecting_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Staff_collecting_engraver);
-  virtual void acknowledge_grob (Grob_info);
+  TRANSLATOR_DECLARATIONS (Staff_collecting_engraver);
+  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 = gh_cons (gi.grob_->self_scm (), staffs);
+  SCM staffs = get_property ("stavesFound");
+  staffs = scm_cons (gi.grob ()->self_scm (), staffs);
 
-      daddy_trans_->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,
+               /* doc */
+               "Maintain the @code{stavesFound} variable.",
+
+               /* create */
+               "",
 
-ENTER_DESCRIPTION(Staff_collecting_engraver,
-/* descr */       "Maintain the stavesFound variable",
+               /* read */
+               "stavesFound ",
 
-/* creats*/       "",
-/* accepts */     "",
-/* acks  */      "staff-symbol-interface",
-/* reads */       "stavesFound",
-/* write */       "stavesFound");
+               /* write */
+               "stavesFound "
+               );