X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-iterator.cc;h=56b477b45e49bfc2849afafefe025d873d7fd597;hb=f0996bcf2f14bd4d55de4ef83b5266fc77bbab52;hp=d09e6c8f3b5f80fa7fbd7469094ec07aa893df95;hpb=9f3df01392cdaf8120bf67c5034e507242be90e7;p=lilypond.git

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index d09e6c8f3b..56b477b45e 100644
--- 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"
 
@@ -20,22 +21,10 @@ Percent_repeat_iterator::Percent_repeat_iterator ()
 }
 
 void
-Percent_repeat_iterator::do_quit()
+Percent_repeat_iterator::do_quit ()
 {
   if (child_iter_)
-    child_iter_->quit();
-}
-Percent_repeat_iterator::Percent_repeat_iterator (Percent_repeat_iterator const & p)
-  : Music_iterator (p)
-{
-  child_iter_ = 0;
- finish_mom_ = p.finish_mom_ ;
- 
-  if (p.child_iter_)
-    {
-      child_iter_ =  p.child_iter_->clone ();
-      scm_gc_unprotect_object (child_iter_->self_scm());
-    }
+    child_iter_->quit ();
 }
 
 bool
@@ -47,8 +36,8 @@ 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 ();
+  Repeated_music * mus = dynamic_cast<Repeated_music *> (get_music ());
+  finish_mom_ = mus->get_length ();
   child_iter_ = unsmob_iterator (get_iterator (mus->body ()));
 }
 
@@ -60,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"));
     }
@@ -70,7 +59,7 @@ Percent_repeat_iterator::process (Moment m)
 
   if (finish_mom_ <= m )
     {
-      child_iter_->quit(); 
+      child_iter_->quit (); 
       child_iter_ = 0;
     }
 }
@@ -91,8 +80,15 @@ Percent_repeat_iterator::try_music_in_children (Music *m) const
 }
 
 void
-Percent_repeat_iterator::derived_mark()const
+Percent_repeat_iterator::derived_mark ()const
+{
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
+}
+
+void
+Percent_repeat_iterator::derived_substitute (Context *f,Context *t )
 {
   if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm());
+    child_iter_->substitute_outlet (f,t);
 }