patch::: 1.3.85.jcn4

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

diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index 66a479efad0599370f7ce047f8a37426ce4a0c58..3e89e02522bf74d0181c67eb2b158e89b31dcda3 100644 (file)
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -3,20 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 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"
-
-void
-Sequential_music_iterator::do_print() const
-{
-  if (iter_p_)
-    iter_p_->print();
-}
+#include "request-chord-iterator.hh"
 
 Sequential_music_iterator::Sequential_music_iterator ()
 {
@@ -25,12 +19,38 @@ Sequential_music_iterator::Sequential_music_iterator ()
   iter_p_ =0;
 }
 
+Sequential_music_iterator::Sequential_music_iterator (Sequential_music_iterator const &src)
+  : Music_iterator (src)
+{
+  cursor_ = src.cursor_;
+  here_mom_ = src.here_mom_;
+  iter_p_ = src.iter_p_;
+}
+
+Sequential_music_iterator::~Sequential_music_iterator()
+{
+  if (iter_p_)
+    {
+      if (iter_p_->ok ())
+       music_l_->origin ()->warning (_ ("Must stop before this music ends"));
+      delete iter_p_;
+      iter_p_ = 0;
+    }
+}
+
+void
+Sequential_music_iterator::do_print() const
+{
+  if (iter_p_)
+    iter_p_->print();
+}
+
 void
 Sequential_music_iterator::construct_children()
 {
-  cursor_ = dynamic_cast<Music_sequence const*> (music_l_)->music_p_list_p_->head_;
+  cursor_ = dynamic_cast<Music_sequence const*> (music_l_)->music_list ();
   
-  while (cursor_)
+  while (gh_pair_p (cursor_ ))
     {
       start_next_element();
       if (!iter_p_->ok()) 
@@ -50,67 +70,91 @@ Sequential_music_iterator::leave_element()
 {
   delete iter_p_;
   iter_p_ =0;
-  Moment elt_time = cursor_->car_->length_mom ();
+  Moment elt_time = unsmob_music (gh_car (cursor_))->length_mom ();
   here_mom_ += elt_time;
-  cursor_ =cursor_->next_;
+  cursor_ =gh_cdr (cursor_);
 }
 
 void
 Sequential_music_iterator::start_next_element()
 {
   assert (!iter_p_);
-  iter_p_ = get_iterator_p (cursor_->car_);
+  iter_p_ = get_iterator_p (unsmob_music (gh_car (cursor_)));
 }
 
 void
 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()
+Music*
+Sequential_music_iterator::get_music ()
 {
-  assert (! iter_p_);
+  if (ok ())
+    return unsmob_music (gh_car (cursor_));
+      
+  return 0;
 }
-
-
-
-
-void
-Sequential_music_iterator::do_process_and_next (Moment until)
+  
+bool
+Sequential_music_iterator::next ()
 {
-  while (1) 
+  if (ok ())
     {
-      Moment local_until = until - here_mom_;
-      while (iter_p_->ok()) 
+      bool b = false;
+      if (iter_p_->ok ())
+       b = iter_p_->next ();
+      if (!b)
        {
-         Moment here = iter_p_->next_moment();
-         if (here != local_until)
-           goto loopexit;
-           
-         iter_p_->process_and_next (local_until);
+         set_sequential_music_translator ();
+         leave_element ();
+         if (gh_pair_p (cursor_))
+           start_next_element ();
+         b = ok ();
        }
+      return b;
+    }
+  return false;
+}
 
-      if (!iter_p_->ok()) 
+/*
+  This should use get_music () and next ()
+ */
+void
+Sequential_music_iterator::do_process_and_next (Moment until)
+{
+  if (ok ())
+    {
+      while (1) 
        {
-         leave_element();
-         
-         if (cursor_)
+         Moment local_until = until - here_mom_;
+         while (iter_p_->ok ()) 
            {
-             start_next_element();
-             set_sequential_music_translator();
+             Moment here = iter_p_->next_moment ();
+             if (here != local_until)
+               return Music_iterator::do_process_and_next (until);
+             
+             iter_p_->process_and_next (local_until);
            }
-         else 
+         
+         if (!iter_p_->ok ()) 
            {
-             goto loopexit;
+             set_sequential_music_translator ();
+             leave_element ();
+             
+             if (gh_pair_p (cursor_))
+               start_next_element ();
+             else 
+               return Music_iterator::do_process_and_next (until);
            }
        }
     }
-
-loopexit:
-
-  Music_iterator::do_process_and_next (until);
 }
 
 Moment
@@ -119,9 +163,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 *m) const
+{ 
+  return iter_p_ ? iter_p_->try_music (m) : 0;
+}