X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-collecting-engraver.cc;h=b8ab0f593f5d11e82baf4d996f0a742620a0e56b;hb=b0c79ceb092e54f20a2d745144db266b2fa3c828;hp=553e0a2d7556902299c941c7288a7a440be1d879;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index 553e0a2d75..b8ab0f593f 100644
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -1,47 +1,72 @@
-/*   
-staff-collecting-engraver.cc --  implement Staff_collecting_engraver
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-(c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
- */
 #include "staff-symbol.hh"
 #include "engraver.hh"
 #include "grob.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_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,
+                /* 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 "
+               );