patch::: 1.3.95.tca2

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 46f9b6da26279fbf7d97acbaa400a99f84324789..132ba004d4be482a1dc50f8f55eb85161e82c736 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -4,7 +4,6 @@
   source file of the GNU LilyPond music typesetter
   
   (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
  */
 
 
@@ -19,7 +18,10 @@ Music_wrapper_iterator::Music_wrapper_iterator ()
 Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
   : Music_iterator (src)
 {
-  child_iter_p_ = src.child_iter_p_->clone ();
+  if (src.child_iter_p_)
+    child_iter_p_ = src.child_iter_p_->clone ();
+  else
+    child_iter_p_ = 0;
 }
 
 Music_wrapper_iterator::~Music_wrapper_iterator ()
@@ -27,11 +29,6 @@ Music_wrapper_iterator::~Music_wrapper_iterator ()
   delete child_iter_p_;
 }
 
-void
-Music_wrapper_iterator::do_print () const
-{
-  child_iter_p_->print ();
-}
 
 void
 Music_wrapper_iterator::construct_children ()
@@ -45,33 +42,39 @@ Music_wrapper_iterator::ok () const
 {
   return child_iter_p_ && child_iter_p_->ok ();
 }
-
 void
-Music_wrapper_iterator::do_process (Moment m)
+Music_wrapper_iterator::skip (Moment m)
 {
-  child_iter_p_->process (m);
-  Music_iterator::do_process (m);
+  /*
+    FIXME: should make sure that the initial try_music () is skipped as
+    well, if you would do
+
+    iter = get_iterator (Side_effect_music); // eg. property setting
+    iter->skip (1/2)
+    iter->process ()
+
+  */
+  child_iter_p_->skip (m);
 }
 
-SCM
-Music_wrapper_iterator::get_music ()
+void
+Music_wrapper_iterator::process (Moment m)
 {
-  return child_iter_p_->get_music ();
+  child_iter_p_->process (m);
 }
 
-bool
-Music_wrapper_iterator::next ()
+SCM
+Music_wrapper_iterator::get_music (Moment m)const
 {
-  return child_iter_p_->next ();
+  return child_iter_p_->get_music (m);
 }
 
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->next_moment ();
+  return child_iter_p_->pending_moment ();
 }
 
-
 Music_iterator*
 Music_wrapper_iterator::try_music_in_children (Music *m) const
 {