X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-collecting-engraver.cc;h=6e4c5ad8098892e9f1a5bc936d67e52ce5e10d0b;hb=f5817f0eb5066fde9b0cb2b87b05ba8e776bd18b;hp=b1924090bc1b611a7634b9ba53121d03e932698d;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index b1924090bc..6e4c5ad809 100644
--- 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--2007  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);
-  DECLARE_ACKNOWLEDGER(staff_symbol);
+  DECLARE_ACKNOWLEDGER (staff_symbol);
+  DECLARE_END_ACKNOWLEDGER (staff_symbol);
 };
 
 Staff_collecting_engraver::Staff_collecting_engraver ()
@@ -31,14 +32,30 @@ Staff_collecting_engraver::acknowledge_staff_symbol (Grob_info gi)
   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_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  */ "",
-		/* reads */ "stavesFound",
-		/* write */ "stavesFound");
+		/* write */
+		"stavesFound "
+		);