* lily/simple-spacer.cc (add_columns): use binary search for

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

diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index c9850c33a5280ecf95fc2aa1886b9bd8385ca6a3..de7cb594c7c8ff8ca1b446000c1e6035841ac1a3 100644 (file)
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef 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.
@@ -51,34 +20,37 @@ struct Grace_fixup
 class Sequential_iterator :  public Music_iterator
 {
 public:
-  Grace_fixup * grace_fixups_;
-  
-  VIRTUAL_COPY_CONS (Music_iterator);
   DECLARE_SCHEME_CALLBACK(constructor, ());
   Sequential_iterator ();
   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 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_;
+  virtual SCM get_music_list ()const;
+  virtual void next_element (bool side_effect);
+
+
+  Grace_fixup *get_grace_fixup () const;
+  void next_grace_fixup ();
+  
+private:
+  Moment last_mom_;
+  Moment here_mom_;
   SCM cursor_;
+  Grace_fixup * grace_fixups_;
   
-  virtual void next_element (bool side_effect);
-  virtual void descend_to_child ();
-  virtual SCM get_music_list ()const;
 };
 
 #endif /* SEQUENTIAL_ITERATOR_HH */