* buildscripts/mf-to-table.py (base): remove AFM support.

[lilypond.git] / lily / percent-repeat-iterator.cc

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index 3bce52030a378bdcc88e23b230561664591fc502..56b477b45e49bfc2849afafefe025d873d7fd597 100644 (file)
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -3,11 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "percent-repeat-iterator.hh"
+
 #include "repeated-music.hh"
 #include "input.hh"
 
@@ -16,14 +17,14 @@ IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
 
 Percent_repeat_iterator::Percent_repeat_iterator ()
 {
-  
+  child_iter_ = 0;
 }
 
-Percent_repeat_iterator::Percent_repeat_iterator (Percent_repeat_iterator const & p)
-  : Music_iterator (p)
+void
+Percent_repeat_iterator::do_quit ()
 {
-  child_iter_ = p.child_iter_ ? p.child_iter_->clone (): 0;
-  finish_mom_ = p.finish_mom_ ;
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
 bool
@@ -35,9 +36,9 @@ Percent_repeat_iterator::ok () const
 void
 Percent_repeat_iterator::construct_children ()
 {
-  Repeated_music * mus =dynamic_cast<Repeated_music *> (get_music ());
-  finish_mom_ = mus->length_mom ();
-  child_iter_ = get_iterator (mus->body ());
+  Repeated_music * mus = dynamic_cast<Repeated_music *> (get_music ());
+  finish_mom_ = mus->get_length ();
+  child_iter_ = unsmob_iterator (get_iterator (mus->body ()));
 }
 
 
@@ -48,7 +49,7 @@ Percent_repeat_iterator::process (Moment m)
     {
       Music_iterator *yeah = try_music (get_music ());
       if (yeah)
-       set_translator (yeah->report_to ());
+       set_context (yeah->get_outlet ());
       else
        get_music ()->origin ()->warning ( _ ("no one to print a percent"));
     }
@@ -58,7 +59,7 @@ Percent_repeat_iterator::process (Moment m)
 
   if (finish_mom_ <= m )
     {
-      delete child_iter_;
+      child_iter_->quit (); 
       child_iter_ = 0;
     }
 }
@@ -78,8 +79,16 @@ Percent_repeat_iterator::try_music_in_children (Music *m) const
   return child_iter_->try_music (m);
 }
 
+void
+Percent_repeat_iterator::derived_mark ()const
+{
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
+}
 
-Percent_repeat_iterator::~Percent_repeat_iterator ()
+void
+Percent_repeat_iterator::derived_substitute (Context *f,Context *t )
 {
-  delete child_iter_;
+  if (child_iter_)
+    child_iter_->substitute_outlet (f,t);
 }