release: 1.3.141

[lilypond.git] / lily / include / music-wrapper-iterator.hh

diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh
index cae63b2096ccab8e3a3789f980daa4202bebe9b0..2f401705efd94fd655c10bbb07c2797aeb23b430 100644 (file)
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -1,9 +1,9 @@
 /*   
-  music-wrapper-iterator.hh -- declare 
+  music-wrapper-iterator.hh -- declare Music_wrapper_iterator
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,24 +13,30 @@
 #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.
+ */
 class Music_wrapper_iterator : public Music_iterator
 {
 public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  static SCM constructor_cxx_function;  
   Music_wrapper_iterator ();
+  Music_wrapper_iterator (Music_wrapper_iterator const&);
+  ~Music_wrapper_iterator ();
 
-protected:
-  virtual ~Music_wrapper_iterator ();
-
-  virtual void do_print () const;
-  virtual void construct_children  () ;
-  virtual void do_process_and_next (Moment) ;
-  virtual Moment next_moment () const;
+  virtual void construct_children () ;
+  virtual Moment pending_moment () const;
+  virtual bool ok () const;
+  virtual SCM get_music (Moment)const;
+  virtual void skip (Moment);
 
 protected:
-  virtual Music_wrapper *music_wrapper_l () const;
-  virtual bool ok () const;
+  virtual void process (Moment);
+  virtual Music_iterator *try_music_in_children (Music *) const;
 
-private:
   Music_iterator *child_iter_p_;
 };