X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-collecting-engraver.cc;h=97711c89b55c75ba594b709295033f60dd88f9bd;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=1a99e79e6179c2864c47372963f217fe167a2666;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index 1a99e79e61..97711c89b5 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--2015  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,10 +26,12 @@ class Staff_collecting_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Staff_collecting_engraver);
-  DECLARE_ACKNOWLEDGER (staff_symbol);
+  void acknowledge_staff_symbol (Grob_info);
+  void acknowledge_end_staff_symbol (Grob_info);
 };
 
-Staff_collecting_engraver::Staff_collecting_engraver ()
+Staff_collecting_engraver::Staff_collecting_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
@@ -31,13 +44,35 @@ 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);
+
+
+void
+Staff_collecting_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Staff_collecting_engraver, staff_symbol);
+  ADD_END_ACKNOWLEDGER (Staff_collecting_engraver, staff_symbol);
+}
 
 ADD_TRANSLATOR (Staff_collecting_engraver,
-		/* doc */ "Maintain the stavesFound variable",
+                /* doc */
+                "Maintain the @code{stavesFound} variable.",
+
+                /* create */
+                "",
+
+                /* read */
+                "stavesFound ",
 
-		/* create */ "",
-		/* accept */ "",
-		/* read */ "stavesFound",
-		/* write */ "stavesFound");
+                /* write */
+                "stavesFound "
+               );