X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=cf0ee67a974c9d3ea3f008003d3dc5a4d6592a84;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e81aced76f453c7578cd321d104391b22e0db08d;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index e81aced76f..cf0ee67a97 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,15 +1,25 @@
-/*   
-  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 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>
 
-#include "music-wrapper-iterator.hh"
+  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 ()
 {
@@ -19,7 +29,8 @@ Music_wrapper_iterator::Music_wrapper_iterator ()
 void
 Music_wrapper_iterator::do_quit ()
 {
-  child_iter_->quit ();
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
 void
@@ -30,17 +41,20 @@ Music_wrapper_iterator::derived_mark () const
 }
 
 void
-Music_wrapper_iterator::derived_substitute (Context *f,Context *t) 
+Music_wrapper_iterator::derived_substitute (Context *f, Context *t)
 {
   if (child_iter_)
-    child_iter_->substitute_outlet (f,t);
+    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 = Music::unsmob (my_music->get_property ("element"));
+  child_iter_ = (child)
+                ? Music_iterator::unsmob (get_iterator (child))
+                : 0;
 }
 
 bool
@@ -49,24 +63,36 @@ Music_wrapper_iterator::ok () const
   return child_iter_ && child_iter_->ok ();
 }
 
-
 void
 Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_->process (m);
+  if (child_iter_)
+    child_iter_->process (m);
 }
 
-
 Moment
 Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_->pending_moment ();
+  if (child_iter_)
+    return child_iter_->pending_moment ();
+  else
+    return Music_iterator::pending_moment ();
 }
 
-Music_iterator*
-Music_wrapper_iterator::try_music_in_children (Music *m) const
+Context *
+Music_wrapper_iterator::get_outlet () const
 {
-  return child_iter_->try_music (m);
+  if (child_iter_)
+    return child_iter_->get_outlet ();
+  return Music_iterator::get_outlet ();
+}
+
+void
+Music_wrapper_iterator::set_context (Context *trans)
+{
+  if (child_iter_)
+    child_iter_->set_context (trans);
+  Music_iterator::set_context (trans);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
@@ -74,5 +100,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 ());
 }