* The grand 2005-2006 replace.

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 1db36ee580657253103f3cccc1f5e06698224ac0..643d30f024ebdfb879d29b15f95ad1d27ecc09c0 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,14 +1,12 @@
-/*   
-  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
-  
+/*
+  music-wrapper-iterator.cc -- implement Music_wrapper_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
 
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music-wrapper-iterator.hh"
-
 #include "music-wrapper.hh"
 
 Music_wrapper_iterator::Music_wrapper_iterator ()
@@ -30,7 +28,7 @@ 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);
@@ -39,8 +37,9 @@ Music_wrapper_iterator::derived_substitute (Context *f, Context *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_ = unsmob_iterator (get_iterator (child));
 }
 
 bool
@@ -49,21 +48,19 @@ Music_wrapper_iterator::ok () const
   return child_iter_ && child_iter_->ok ();
 }
 
-
 void
 Music_wrapper_iterator::process (Moment m)
 {
   child_iter_->process (m);
 }
 
-
 Moment
 Music_wrapper_iterator::pending_moment () const
 {
   return child_iter_->pending_moment ();
 }
 
-Music_iterator*
+Music_iterator *
 Music_wrapper_iterator::try_music_in_children (Music *m) const
 {
   return child_iter_->try_music (m);