2003 -> 2004

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 396e9c4657aea44f323c2172a5043fe2dd994f96..4e264db1874b7431218b8740ae402b38f83fed1c 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -3,8 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
@@ -13,67 +12,67 @@
 
 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()
 {
-  child_iter_p_ = src.child_iter_p_->clone ();
+  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::do_print () const
+Music_wrapper_iterator::derived_substitute (Translator_group*f,Translator_group*t) 
 {
-  child_iter_p_->print ();
+  
+  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 * m =  dynamic_cast<Music_wrapper const*> (get_music ())-> element();  
+  child_iter_ = unsmob_iterator (get_iterator (m));
 }
 
 bool
 Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_ && child_iter_p_->ok ();
+  return child_iter_ && child_iter_->ok ();
 }
 
+
 void
-Music_wrapper_iterator::do_process_and_next (Moment m)
+Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_p_->process_and_next (m);
-  Music_iterator::do_process_and_next (m);
+  child_iter_->process (m);
 }
 
-Music*
-Music_wrapper_iterator::get_music ()
-{
-  return child_iter_p_->get_music ();
-}
 
-bool
-Music_wrapper_iterator::next ()
+Moment
+Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->next ();
+  return child_iter_->pending_moment ();
 }
 
-Moment
-Music_wrapper_iterator::next_moment () const
+Music_iterator*
+Music_wrapper_iterator::try_music_in_children (Music *m) const
 {
-  return child_iter_p_->next_moment ();
+  return child_iter_->try_music (m);
 }
 
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
 
-Music_iterator*
-Music_wrapper_iterator::try_music_in_children (Music *m) const
+bool
+Music_wrapper_iterator::run_always () const
 {
-  return child_iter_p_->try_music (m);
+  return child_iter_->run_always ();
 }