X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=009f64f237caa0e7bdd782f435a0736958ffeede;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=03fefdd44e90269c69b986a16a206b7ce2dd2de8;hpb=434da79e9d7684b2b05fa92a6d808d4ea7933046;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 03fefdd44e..009f64f237 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,64 +1,104 @@
-/*   
-  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "music-wrapper-iterator.hh"
 #include "music-wrapper.hh"
+#include "music.hh"
 
 Music_wrapper_iterator::Music_wrapper_iterator ()
 {
-  child_iter_p_ =0;
+  child_iter_ = 0;
 }
 
-
-
 void
-Music_wrapper_iterator::do_print () const
+Music_wrapper_iterator::do_quit ()
 {
-  child_iter_p_->print ();
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
 void
-Music_wrapper_iterator::construct_children ()
+Music_wrapper_iterator::derived_mark () const
 {
-  child_iter_p_ =
-    get_iterator_p (dynamic_cast<Music_wrapper const*> (music_l_)->element_l ());
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
+void
+Music_wrapper_iterator::derived_substitute (Context *f, Context *t)
 {
-  delete child_iter_p_;
+  if (child_iter_)
+    child_iter_->substitute_outlet (f, t);
 }
 
+void
+Music_wrapper_iterator::construct_children ()
+{
+  Music *my_music = get_music ();
+  Music *child = unsmob<Music> (my_music->get_property ("element"));
+  child_iter_ = (child)
+                ? unsmob<Music_iterator> (get_iterator (child))
+                : 0;
+}
 
 bool
 Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_ && child_iter_p_->ok ();
+  return child_iter_ && child_iter_->ok ();
 }
 
 void
-Music_wrapper_iterator::do_process_and_next (Moment m)
+Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_p_->process_and_next (m);
-  Music_iterator::do_process_and_next (m);
+  if (child_iter_)
+    child_iter_->process (m);
 }
 
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->next_moment ();
+  if (child_iter_)
+    return child_iter_->pending_moment ();
+  else
+    return Music_iterator::pending_moment ();
 }
 
-Music*
-Music_wrapper_iterator::next_music_l ()
+Context *
+Music_wrapper_iterator::get_outlet () const
+{
+  if (child_iter_)
+    return child_iter_->get_outlet ();
+  return Music_iterator::get_outlet ();
+}
+
+void
+Music_wrapper_iterator::set_context (Context *trans)
 {
-  return child_iter_p_->next_music_l ();
+  if (child_iter_)
+    child_iter_->set_context (trans);
+  Music_iterator::set_context (trans);
 }
 
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
+
+bool
+Music_wrapper_iterator::run_always () const
+{
+  return (child_iter_ && child_iter_->run_always ());
+}