X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsequential-iterator.hh;h=9cf145a8da2e170ac15942482a89c26fdc078f8d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=efdc5634ea177defdea8b81ae57865958ee88c64;hpb=d765f3af45be51f15da55cf570a4b172200e1035;p=lilypond.git

diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index efdc5634ea..9cf145a8da 100644
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -1,9 +1,9 @@
-/*   
+/*
   sequential-iterator.hh -- declare Sequential_iterator
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef SEQUENTIAL_ITERATOR_HH
@@ -12,73 +12,43 @@
 #include "music-iterator.hh"
 #include "protected-scm.hh"
 
-/*
-
-  This is a lookahead list for grace notes.
-
-   {  ... X \grace Y  Z ... }
-
-   normally, the ending of X is the start of Z. In case of a grace
-   note, we take off a little at the end of X. What is stored: START
-   (start point of X), LENGTH (length of X), GRACE_START (start_music
-   of Y), and the next fixup element.
-
-  This is also done for nested musics, i.e.
-
-  voiceA = \notes { \grace b16 c'2 }
-  voiceB = \notes { c'2 \voiceA }
-
-  the iterator for voiceB will contain a fixup entry with (START=0/1,
-  LENGTH=2/1, GRACE_START=(0G-1/16) ) 
-   
-  Graces at the start of a sequential music iterator are handled
-  by initting here_mom_ with Music::start_music (); no fixups are needed.
-
-*/
-struct Grace_fixup 
-{
-  Moment start_;
-  Moment length_;
-
-  Rational grace_start_;  
-  Grace_fixup *next_;
-};
-
 /** Sequential_music iteration: walk each element in turn, and
-  construct an iterator for every element.
-  
- */
-class Sequential_iterator :  public Music_iterator
+    construct an iterator for every element.
+*/
+class Sequential_iterator : public Music_iterator
 {
 public:
-  Grace_fixup * grace_fixups_;
-  
-  VIRTUAL_COPY_CONS (Music_iterator);
-  DECLARE_SCHEME_CALLBACK(constructor, ());
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Sequential_iterator);
   Sequential_iterator ();
-  Sequential_iterator (Sequential_iterator const&);
+  Sequential_iterator (Sequential_iterator const &);
+  virtual void derived_substitute (Context *f, Context *t);
+
   virtual void derived_mark () const;
 
   virtual void construct_children ();
   virtual Moment pending_moment () const;
-  virtual void do_quit(); 
+  virtual void do_quit ();
   virtual bool ok () const;
-  virtual void skip (Moment);
-  virtual SCM get_pending_events (Moment)const;
 
 protected:
   virtual void process (Moment);
-  virtual Music_iterator *try_music_in_children (Music *) const;
-
+  virtual bool run_always () const;
+  
 protected:
-  Moment here_mom_;
-  Music_iterator * iter_;
-  SCM  list_;
-  SCM cursor_;
+  Music_iterator *iter_;
   
+  virtual SCM get_music_list () const;
   virtual void next_element (bool side_effect);
-  virtual void descend_to_child ();
-  virtual SCM get_music_list ()const;
+
+  Grace_fixup *get_grace_fixup () const;
+  void next_grace_fixup ();
+
+private:
+  Moment last_mom_;
+  Moment here_mom_;
+  SCM cursor_;
+  Grace_fixup *grace_fixups_;
 };
 
 #endif /* SEQUENTIAL_ITERATOR_HH */