* lily/auto-beam-engraver.cc (process_music): end/junk beam if

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

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index c5f72417c9a417583572a1ffda6158bee51d6477..38e00b73449a5b9200524121c9e721f8a4b907a3 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
@@ -12,73 +12,74 @@
 
 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)
 {
-  if (src.child_iter_p_)
-    child_iter_p_ = src.child_iter_p_->clone ();
-  else
-    child_iter_p_ = 0;
+  child_iter_ = 0;
+  if  (src.child_iter_)
+  {
+    child_iter_ = src.child_iter_->clone () ;
+    scm_gc_unprotect_object (child_iter_->self_scm());
+  }
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
+void
+Music_wrapper_iterator::do_quit()
 {
-  delete child_iter_p_;
+  child_iter_->quit();
+}
+
+void
+Music_wrapper_iterator::derived_mark () const
+{
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm());
 }
 
 
 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::skip (Moment m)
 {
-  /*
-    FIXME: should make sure that the initial try_music () is skipped as
-    well, if you would do
-
-    iter = get_iterator (Side_effect_music); // eg. property setting
-    iter->skip (1/2)
-    iter->process ()
-
-  */
-  child_iter_p_->skip (m);
+  child_iter_->skip (m);
 }
 
 void
 Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_p_->process (m);
+  child_iter_->process (m);
 }
 
 SCM
-Music_wrapper_iterator::get_music (Moment m)const
+Music_wrapper_iterator::get_pending_events (Moment m)const
 {
-  return child_iter_p_->get_music (m);
+  return child_iter_->get_pending_events (m);
 }
 
 Moment
 Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->pending_moment ();
+  return child_iter_->pending_moment ();
 }
 
 Music_iterator*
 Music_wrapper_iterator::try_music_in_children (Music *m) const
 {
-  return child_iter_p_->try_music (m);
+  return child_iter_->try_music (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);