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

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index d09e6c8f3b..79fd496daa 100644
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -1,41 +1,29 @@
-/*   
-  percent-repeat-iterator.cc --  implement Percent_repeat_iterator
-  
+/*
+  percent-repeat-iterator.cc -- implement Percent_repeat_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2001--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "percent-repeat-iterator.hh"
-#include "repeated-music.hh"
+
 #include "input.hh"
+#include "international.hh"
+#include "repeated-music.hh"
 
 IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator);
 
-
 Percent_repeat_iterator::Percent_repeat_iterator ()
 {
   child_iter_ = 0;
 }
 
 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,12 +35,11 @@ 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_ = unsmob_iterator (get_iterator (mus->body ()));
+  Music *mus = get_music ();
+  finish_mom_ = mus->get_length ();
+  child_iter_ = unsmob_iterator (get_iterator (Repeated_music::body (mus)));
 }
 
-
 void
 Percent_repeat_iterator::process (Moment m)
 {
@@ -60,17 +47,17 @@ 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"));
+	get_music ()->origin ()->warning (_ ("no one to print a percent"));
     }
-  
+
   if (child_iter_->ok ())
     child_iter_->process (m);
 
-  if (finish_mom_ <= m )
+  if (finish_mom_ <= m)
     {
-      child_iter_->quit(); 
+      child_iter_->quit ();
       child_iter_ = 0;
     }
 }
@@ -81,18 +68,25 @@ Percent_repeat_iterator::pending_moment ()const
   if (child_iter_->ok ())
     return child_iter_->pending_moment ();
   else
-    return finish_mom_ ;
+    return finish_mom_;
 }
 
-Music_iterator*
+Music_iterator *
 Percent_repeat_iterator::try_music_in_children (Music *m) const
 {
   return child_iter_->try_music (m);
 }
 
 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);
 }