Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond into fret...

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

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index 21ea59457b68eb74769a948bd829d662362b35e2..29b05f4da1282529f17f181d65fd213858d96a7b 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--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "staff-symbol.hh"
@@ -16,6 +16,7 @@ class Staff_collecting_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Staff_collecting_engraver);
   DECLARE_ACKNOWLEDGER (staff_symbol);
+  DECLARE_END_ACKNOWLEDGER (staff_symbol);
 };
 
 Staff_collecting_engraver::Staff_collecting_engraver ()
@@ -31,13 +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 */ "",
-               /* reads */ "stavesFound",
-               /* write */ "stavesFound");
+               /* write */
+               "stavesFound "
+               );