Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 428cac5a623a3a0308070a205bc938e41ec9ffa9..e89896ce663652bca52800985e9ecdf487eeedc4 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,18 +1,18 @@
-/*   
-  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--2004 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"
+#include "music.hh"
 
 Music_wrapper_iterator::Music_wrapper_iterator ()
 {
-  child_iter_ =0;
+  child_iter_ = 0;
 }
 
 void
@@ -29,18 +29,18 @@ 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 = unsmob_music (my_music->get_property ("element"));
+  child_iter_ = unsmob_iterator (get_iterator (child));
 }
 
 bool
@@ -49,26 +49,18 @@ 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_wrapper_iterator::try_music_in_children (Music *m) const
-{
-  return child_iter_->try_music (m);
-}
-
 IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
 
 bool