X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=e208d135f5c75bf63973866b8815695263f4499c;hb=91dee7fa3d1e45278420ad0577f0043473a5fbf0;hp=ee19b425e79697232458db4913e7d68058bd6468;hpb=ff498ed01dc80778ac61254566dc811301741003;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index ee19b425e7..e208d135f5 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,50 +1,60 @@
-/*   
-  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
+  Copyright (C) 1998--2012 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_ =0;
-}
-
-Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
-  : Music_iterator (src)
 {
   child_iter_ = 0;
-  if  (src.child_iter_)
-  {
-    child_iter_ = src.child_iter_->clone () ;
-    scm_gc_unprotect_object (child_iter_->self_scm());
-  }
 }
 
 void
-Music_wrapper_iterator::do_quit()
+Music_wrapper_iterator::do_quit ()
 {
-  child_iter_->quit();
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
 void
 Music_wrapper_iterator::derived_mark () const
 {
   if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm());
+    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 ()
 {
-  Music * m =  dynamic_cast<Music_wrapper const*> (get_music ())-> element();  
-  child_iter_ = unsmob_iterator (get_iterator (m));
+  Music *my_music = get_music ();
+  Music *child = unsmob_music (my_music->get_property ("element"));
+  child_iter_ = (child)
+                ? unsmob_iterator (get_iterator (child))
+                : 0;
 }
 
 bool
@@ -52,34 +62,21 @@ Music_wrapper_iterator::ok () const
 {
   return child_iter_ && child_iter_->ok ();
 }
-void
-Music_wrapper_iterator::skip (Moment m)
-{
-  child_iter_->skip (m);
-}
 
 void
 Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_->process (m);
-}
-
-SCM
-Music_wrapper_iterator::get_pending_events (Moment m)const
-{
-  return child_iter_->get_pending_events (m);
+  if (child_iter_)
+    child_iter_->process (m);
 }
 
 Moment
 Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_->pending_moment ();
-}
-
-Music_iterator*
-Music_wrapper_iterator::try_music_in_children (Music *m) const
-{
-  return child_iter_->try_music (m);
+  if (child_iter_)
+    return child_iter_->pending_moment ();
+  else
+    return Music_iterator::pending_moment ();
 }
 
 IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
@@ -87,5 +84,5 @@ IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
 bool
 Music_wrapper_iterator::run_always () const
 {
-  return child_iter_->run_always ();
+  return (child_iter_ && child_iter_->run_always ());
 }