X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-collecting-engraver.cc;h=29ddd8d70b353ae32f2c2c1eec399d99af7f491f;hb=f3961fcc4d9b694786d3004b1f83862cc957051c;hp=ad8ca8546af9166f6c8f18b60e4660362d37dfa6;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index ad8ca8546a..29ddd8d70b 100644
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -1,9 +1,20 @@
 /*
-  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--2005  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"
@@ -15,31 +26,47 @@ 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_staff_symbol (Grob_info gi)
+{
+  SCM staffs = get_property ("stavesFound");
+  staffs = scm_cons (gi.grob ()->self_scm (), staffs);
 
+  context ()->set_property ("stavesFound", staffs);
 }
 
 void
-Staff_collecting_engraver::acknowledge_grob (Grob_info gi)
+Staff_collecting_engraver::acknowledge_end_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_delq (gi.grob ()->self_scm (), staffs);
 
-      context ()->set_property ("stavesFound", 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 "
+		);