patch::: 1.3.86.jcn1

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index af658cf72a5905d6345810cd0925f7bc0cb12328..396e9c4657aea44f323c2172a5043fe2dd994f96 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -16,7 +16,16 @@ Music_wrapper_iterator::Music_wrapper_iterator ()
   child_iter_p_ =0;
 }
 
+Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
+  : Music_iterator (src)
+{
+  child_iter_p_ = src.child_iter_p_->clone ();
+}
 
+Music_wrapper_iterator::~Music_wrapper_iterator ()
+{
+  delete child_iter_p_;
+}
 
 void
 Music_wrapper_iterator::do_print () const
@@ -31,12 +40,6 @@ Music_wrapper_iterator::construct_children ()
     get_iterator_p (dynamic_cast<Music_wrapper const*> (music_l_)->element ());
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
-{
-  delete child_iter_p_;
-}
-
-
 bool
 Music_wrapper_iterator::ok () const
 {
@@ -50,6 +53,17 @@ Music_wrapper_iterator::do_process_and_next (Moment m)
   Music_iterator::do_process_and_next (m);
 }
 
+Music*
+Music_wrapper_iterator::get_music ()
+{
+  return child_iter_p_->get_music ();
+}
+
+bool
+Music_wrapper_iterator::next ()
+{
+  return child_iter_p_->next ();
+}
 
 Moment
 Music_wrapper_iterator::next_moment () const