patch::: 1.5.1.jcn2

[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 1d97eb9067f1ea119c21da649651db9e9322f9c1..2f401705efd94fd655c10bbb07c2797aeb23b430 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -22,19 +22,19 @@ 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 ();
 
-  virtual void construct_children  () ;
-  virtual Moment next_moment () const;
+  virtual void construct_children () ;
+  virtual Moment pending_moment () const;
   virtual bool ok () const;
-  virtual Music* get_music ();
-  virtual bool next ();
+  virtual SCM get_music (Moment)const;
+  virtual void skip (Moment);
 
 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_;