release: 1.2.14

[lilypond.git] / lily / sequential-music-iterator.cc

diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index 69c1eed1243fc4ce45ee0e6c925581645a00b750..58e04051752d014ef79de72abae9c580a06c91d6 100644 (file)
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-
+#include "grace-iterator.hh"
 #include "translator-group.hh"
 #include "debug.hh"
 #include "sequential-music-iterator.hh"
 #include "music-list.hh"
+#include "request-chord-iterator.hh"
 
 
 void
@@ -21,23 +22,17 @@ Sequential_music_iterator::do_print() const
 
 Sequential_music_iterator::Sequential_music_iterator ()
 {
-  cursor_p_ = 0;
+  cursor_ = 0;
   here_mom_ = 0;
   iter_p_ =0;
 }
 
-Sequential_music*
-Sequential_music_iterator::sequential_music_l () const
-{
-  return (Sequential_music *)music_l_;
-}
-
 void
 Sequential_music_iterator::construct_children()
 {
-  cursor_p_ = new PCursor<Music*> (sequential_music_l ()->music_p_list_p_->top ());
+  cursor_ = dynamic_cast<Music_sequence const*> (music_l_)->music_p_list_p_->head_;
   
-  while (cursor_p_->ok()) 
+  while (cursor_)
     {
       start_next_element();
       if (!iter_p_->ok()) 
@@ -46,7 +41,7 @@ Sequential_music_iterator::construct_children()
        }
       else 
        {
-         set_Sequential_music_translator();
+         set_sequential_music_translator();
          break;
        }
     }
@@ -57,29 +52,38 @@ Sequential_music_iterator::leave_element()
 {
   delete iter_p_;
   iter_p_ =0;
-  Moment elt_time = cursor_p_->ptr()->duration ();
+  Moment elt_time = cursor_->car_->length_mom ();
   here_mom_ += elt_time;
-  cursor_p_->next();
+  cursor_ =cursor_->next_;
 }
 
 void
 Sequential_music_iterator::start_next_element()
 {
   assert (!iter_p_);
-  iter_p_ = get_iterator_p ( cursor_p_->ptr());
+  iter_p_ = get_iterator_p (cursor_->car_);
 }
 
 void
-Sequential_music_iterator::set_Sequential_music_translator()
+Sequential_music_iterator::set_sequential_music_translator()
 {
-  if (iter_p_->report_to_l()->depth_i () > report_to_l ()->depth_i ())
-    set_translator (iter_p_->report_to_l());
+  Translator_group  * child_report = child_report = iter_p_->report_to_l ();
+  if (dynamic_cast<Grace_iterator*> (iter_p_))
+    child_report = child_report->daddy_trans_l_;
+    
+  if (report_to_l()->depth_i () < child_report->depth_i ())
+    set_translator (child_report);
 }
 
 Sequential_music_iterator::~Sequential_music_iterator()
 {
-  delete cursor_p_;
-  assert (! iter_p_);
+  if (iter_p_)
+    {
+      if (iter_p_->ok ())
+       music_l_->warning (_ ("Must stop before this music ends"));
+      delete iter_p_;
+      iter_p_ = 0;
+    }
 }
 
 
@@ -88,6 +92,9 @@ Sequential_music_iterator::~Sequential_music_iterator()
 void
 Sequential_music_iterator::do_process_and_next (Moment until)
 {
+  if (!iter_p_)
+    return;
+
   while (1) 
     {
       Moment local_until = until - here_mom_;
@@ -99,20 +106,16 @@ Sequential_music_iterator::do_process_and_next (Moment until)
            
          iter_p_->process_and_next (local_until);
        }
-
+      
       if (!iter_p_->ok()) 
        {
+         set_sequential_music_translator();
          leave_element();
          
-         if (cursor_p_->ok()) 
-           {
-             start_next_element();
-             set_Sequential_music_translator();
-           }
+         if (cursor_)
+           start_next_element();
          else 
-           {
-             goto loopexit;
-           }
+           goto loopexit;
        }
     }
 
@@ -127,9 +130,15 @@ Sequential_music_iterator::next_moment() const
   return iter_p_->next_moment() + here_mom_;
 }
 
+
 bool
 Sequential_music_iterator::ok() const
 {
   return iter_p_;
 }
 
+Music_iterator*
+Sequential_music_iterator::try_music_in_children (Music const *m) const
+{ 
+  return iter_p_ ? iter_p_->try_music (m) : 0;
+}