X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=74e4cf3f64d256695b4c928024835bb1a6d7e185;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=132ba004d4be482a1dc50f8f55eb85161e82c736;hpb=45bae7c4e36d595cf545c85a53ff14c95bf4cf9c;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 132ba004d4..74e4cf3f64 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,82 +1,104 @@
-/*   
-  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1998--2014 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;
 }
 
-Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
-  : Music_iterator (src)
+void
+Music_wrapper_iterator::do_quit ()
 {
-  if (src.child_iter_p_)
-    child_iter_p_ = src.child_iter_p_->clone ();
-  else
-    child_iter_p_ = 0;
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
+void
+Music_wrapper_iterator::derived_mark () const
 {
-  delete child_iter_p_;
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
+void
+Music_wrapper_iterator::derived_substitute (Context *f, Context *t)
+{
+  if (child_iter_)
+    child_iter_->substitute_outlet (f, t);
+}
 
 void
 Music_wrapper_iterator::construct_children ()
 {
-  child_iter_p_ =
-    get_iterator_p (dynamic_cast<Music_wrapper const*> (music_l_)->element ());
+  Music *my_music = get_music ();
+  Music *child = unsmob_music (my_music->get_property ("element"));
+  child_iter_ = (child)
+                ? Music_iterator::unsmob (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::skip (Moment m)
+Music_wrapper_iterator::process (Moment 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);
+  if (child_iter_)
+    child_iter_->process (m);
 }
 
-void
-Music_wrapper_iterator::process (Moment m)
+Moment
+Music_wrapper_iterator::pending_moment () const
 {
-  child_iter_p_->process (m);
+  if (child_iter_)
+    return child_iter_->pending_moment ();
+  else
+    return Music_iterator::pending_moment ();
 }
 
-SCM
-Music_wrapper_iterator::get_music (Moment m)const
+Context *
+Music_wrapper_iterator::get_outlet () const
 {
-  return child_iter_p_->get_music (m);
+  if (child_iter_)
+    return child_iter_->get_outlet ();
+  return Music_iterator::get_outlet ();
 }
 
-Moment
-Music_wrapper_iterator::pending_moment () const
+void
+Music_wrapper_iterator::set_context (Context *trans)
 {
-  return child_iter_p_->pending_moment ();
+  if (child_iter_)
+    child_iter_->set_context (trans);
+  Music_iterator::set_context (trans);
 }
 
-Music_iterator*
-Music_wrapper_iterator::try_music_in_children (Music *m) const
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
+
+bool
+Music_wrapper_iterator::run_always () const
 {
-  return child_iter_p_->try_music (m);
+  return (child_iter_ && child_iter_->run_always ());
 }