* scm/define-markup-commands.scm (fill-line): use

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 15ca7968f3063c381fbb319cbd4922408ff7ad88..e81aced76f453c7578cd321d104391b22e0db08d 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -3,47 +3,43 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
 #include "music-wrapper-iterator.hh"
+
 #include "music-wrapper.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();
+  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();  
+  Music * m =  dynamic_cast<Music_wrapper const*> (get_music ())-> element ();  
   child_iter_ = unsmob_iterator (get_iterator (m));
 }
 
@@ -52,11 +48,7 @@ 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)
@@ -64,11 +56,6 @@ 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);
-}
 
 Moment
 Music_wrapper_iterator::pending_moment () const
@@ -83,3 +70,9 @@ Music_wrapper_iterator::try_music_in_children (Music *m) const
 }
 
 IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
+
+bool
+Music_wrapper_iterator::run_always () const
+{
+  return child_iter_->run_always ();
+}