patch::: 1.3.85.jcn4

[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 bcbf81769cffd5583d16d22fe5d5caa967edb76b..1a2dc730e7221c233a6857a8eb952c6fff75f898 100644 (file)
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -1,16 +1,15 @@
 /*
-  Sequential_music-iter.hh -- declare Sequential_music_iterator
+  Sequential_music-iterator.hh -- declare Sequential_music_iterator
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#ifndef SEQUENTIAL_MUSIC_ITER_HH
-#define SEQUENTIAL_MUSIC_ITER_HH
+#ifndef SEQUENTIAL_MUSIC_ITERATOR_HH
+#define SEQUENTIAL_MUSIC_ITERATOR_HH
 
 #include "music-iterator.hh"
-#include "pcursor.hh"
 
 /** Sequential_music iteration: walk each element in turn, and
   construct an iterator for every element.
@@ -19,22 +18,27 @@
 class Sequential_music_iterator :  public Music_iterator
 {
 public:
+  VIRTUAL_COPY_CONS (Music_iterator);
   Sequential_music_iterator ();
-  ~Sequential_music_iterator ();
+  Sequential_music_iterator (Sequential_music_iterator const&);
+  virtual ~Sequential_music_iterator ();
 
   virtual void construct_children ();
   virtual Moment next_moment () const;
   virtual bool ok () const;
+  virtual Music* get_music ();
+  virtual bool next ();
 
 protected:
-  Sequential_music * sequential_music_l() const;
-
   virtual void do_print() const;
   virtual void do_process_and_next (Moment);
+  virtual Music_iterator *try_music_in_children (Music *) const;
+
 
 private:
   Moment here_mom_;
-  PCursor<Music*> *cursor_p_;
+
+  SCM cursor_;
   Music_iterator * iter_p_;
 
   /*
@@ -42,7 +46,7 @@ private:
    */
   void start_next_element();
   void leave_element();
-  void set_Sequential_music_translator();
+  void set_sequential_music_translator();
 };
 
-#endif // SEQUENTIAL_MUSIC_ITER_HH
+#endif // SEQUENTIAL_MUSIC_ITERATOR_HH