release: 1.3.107

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

diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh
index 160556cc9d914c8a8e030cbb50af31bd4018b866..5da129b28661eb9dd1c52ae94979342a8969914f 100644 (file)
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH
@@ -18,31 +18,29 @@
 class Sequential_music_iterator :  public Music_iterator
 {
 public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  static SCM constructor_cxx_function;
   Sequential_music_iterator ();
+  Sequential_music_iterator (Sequential_music_iterator const&);
   virtual ~Sequential_music_iterator ();
 
   virtual void construct_children ();
-  virtual Moment next_moment () const;
+  virtual Moment pending_moment () const;
   virtual bool ok () const;
+  virtual void skip (Moment);
+  virtual SCM get_music (Moment)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);
+  virtual Music_iterator *try_music_in_children (Music *) const;
 
 private:
   Moment here_mom_;
-
-  Cons<Music> *cursor_;
+  SCM cursor_;
   Music_iterator * iter_p_;
 
-  /*
-    perhaps these can be virtual and protected iso. private?  
-   */
-  void start_next_element();
-  void leave_element();
-  void set_sequential_music_translator();
+  void next_element ();
+  void descend_to_child ();
 };
 
 #endif // SEQUENTIAL_MUSIC_ITERATOR_HH