release commit

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

diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index eac01f3f7741a17940b4fd4378a81ea1fe35427e..de7cb594c7c8ff8ca1b446000c1e6035841ac1a3 100644 (file)
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -12,37 +12,6 @@
 #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.
@@ -77,12 +46,11 @@ protected:
   void next_grace_fixup ();
   
 private:
+  Moment last_mom_;
   Moment here_mom_;
-  SCM list_;
   SCM cursor_;
   Grace_fixup * grace_fixups_;
   
-  virtual void descend_to_child ();
 };
 
 #endif /* SEQUENTIAL_ITERATOR_HH */