X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-wrapper-iterator.hh;h=82a069574e4f41dcdf69c8390177cb8a23e5d035;hb=94cce45d444cd6700d3f4df84cda68fb7de96cd7;hp=97bbe2abc14ce685f75e732d6ca5356753a5a8b4;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index 97bbe2abc1..82a069574e 100644
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -1,42 +1,51 @@
-/*   
-  music-wrapper-iterator.hh -- declare Music_wrapper_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.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/>.
+*/
 
 #ifndef MUSIC_WRAPPER_ITERATOR_HH
 #define MUSIC_WRAPPER_ITERATOR_HH
 
-#include "music.hh"
 #include "music-iterator.hh"
 
-/** 
-  The iterator for a #Music_wrapper#.  Since #Music_wrapper# essentially
-  does nothing, this iterator creates a child iterator and delegates
-  all work to that child.
- */
+/**
+   The iterator for a #Music_wrapper#.  Since #Music_wrapper# essentially
+   does nothing, this iterator creates a child iterator and delegates
+   all work to that child.
+*/
 class Music_wrapper_iterator : public Music_iterator
 {
 public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
   Music_wrapper_iterator ();
-  ~Music_wrapper_iterator ();
+  DECLARE_CLASSNAME(Music_wrapper_iterator);
 
-  virtual void construct_children  () ;
-  virtual Moment next_moment () const;
+  virtual void derived_substitute (Context *f, Context *t);
+  virtual void derived_mark () const;
+  virtual void construct_children ();
+  virtual Moment pending_moment () const;
+  virtual void do_quit ();
   virtual bool ok () const;
-
+  virtual bool run_always () const;
 protected:
-  virtual void do_print () const;
-  virtual void do_process_and_next (Moment) ;
-  virtual Music_iterator *try_music_in_children (Music const *) const;
+  virtual void process (Moment);
 
-  Music_iterator *child_iter_p_;
+  Music_iterator *child_iter_;
 };
 
 #endif /* MUSIC_WRAPPER_ITERATOR_HH */
 
-
-