release: 1.3.19

[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 4437d461ed209f3696f3aeef55297db5687ce01a..97bbe2abc14ce685f75e732d6ca5356753a5a8b4 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,19 +13,27 @@
 #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
 {
-  Music_iterator *child_iter_p_;
-  Music_wrapper *music_l_;
 public:
-  Music_wrapper_iterator (Music_wrapper*);
+  Music_wrapper_iterator ();
   ~Music_wrapper_iterator ();
-  virtual void do_print () const;
+
   virtual void construct_children  () ;
-  virtual void process_and_next (Moment) ;
   virtual Moment next_moment () const;
   virtual bool ok () const;
-  DECLARE_MY_RUNTIME_TYPEINFO;
+
+protected:
+  virtual void do_print () const;
+  virtual void do_process_and_next (Moment) ;
+  virtual Music_iterator *try_music_in_children (Music const *) const;
+
+  Music_iterator *child_iter_p_;
 };
 
 #endif /* MUSIC_WRAPPER_ITERATOR_HH */