Imported sources

[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 8200709e52f4d803b08c4c7d44b69220c85a0296..006d3dce14a2038dc7beb95856b232cef284f475 100644 (file)
--- a/lily/include/music-wrapper-iterator.hh
+++ b/lily/include/music-wrapper-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -21,19 +21,22 @@
 class Music_wrapper_iterator : public Music_iterator
 {
 public:
+  DECLARE_SCHEME_CALLBACK(constructor, ());  
   Music_wrapper_iterator ();
-  ~Music_wrapper_iterator ();
 
-  virtual void construct_children  () ;
-  virtual Moment next_moment () const;
-  virtual bool ok () const;
+  virtual void derived_substitute (Translator_group*f, Translator_group*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 void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
 
-  Music_iterator *child_iter_p_;
+  Music_iterator *child_iter_;
 };
 
 #endif /* MUSIC_WRAPPER_ITERATOR_HH */