2003 -> 2004

[lilypond.git] / lily / include / folded-repeat-iterator.hh

diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh
index c5f73658dfa592a7896f9bacb75a88ab862dc94b..4ae007d8decd557b44827f2c2f7c787e698ca3bd 100644 (file)
--- a/lily/include/folded-repeat-iterator.hh
+++ b/lily/include/folded-repeat-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,25 +19,30 @@
 class Folded_repeat_iterator : public Music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+
+  Folded_repeat_iterator (Folded_repeat_iterator const &src);
   Folded_repeat_iterator ();
-  ~Folded_repeat_iterator ();
-  
+  virtual void derived_mark () const;
+  virtual void derived_substitute (Translator_group*f, Translator_group*t) ;
+
+
   virtual void construct_children ();
-  virtual Moment next_moment () const;
+  virtual Moment pending_moment () const;
+  virtual void do_quit(); 
   virtual bool ok () const;
 
 protected:
   void enter_alternative ();
   void leave_body ();
   
-  virtual void do_process (Moment);
+  virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
 
 private:
-  Music_iterator * main_iter_p_;
-  Music_iterator * alternative_iter_p_;
-  int count_;
+  Music_iterator * main_iter_;
+  Music_iterator * alternative_iter_;
+
   Moment main_length_mom_;
 };
 #endif /* FOLDED_REPEAT_ITERATOR_HH */