*** empty log message ***

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

diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc
index cc9c112ad8cbd150cf4e6d781e42617241d1fbe8..bd7a36b9a0a62de8e507236338eda0c21de7a2d1 100644 (file)
--- a/lily/percent-repeat-iterator.cc
+++ b/lily/percent-repeat-iterator.cc
@@ -3,7 +3,7 @@
   
   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>
   
  */
 
@@ -17,23 +17,13 @@ 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_ = p.child_iter_ ? p.child_iter_->clone (): 0;
-  finish_mom_ = p.finish_mom_ ;
-
-  if(child_iter_)
-    scm_gc_unprotect_object (child_iter_->self_scm());
+    child_iter_->quit ();
 }
 
 bool
@@ -46,7 +36,7 @@ void
 Percent_repeat_iterator::construct_children ()
 {
   Repeated_music * mus =dynamic_cast<Repeated_music *> (get_music ());
-  finish_mom_ = mus->length_mom ();
+  finish_mom_ = mus->get_length ();
   child_iter_ = unsmob_iterator (get_iterator (mus->body ()));
 }
 
@@ -58,7 +48,7 @@ Percent_repeat_iterator::process (Moment m)
     {
       Music_iterator *yeah = try_music (get_music ());
       if (yeah)
-       set_translator (yeah->report_to ());
+       set_translator (yeah->get_outlet ());
       else
        get_music ()->origin ()->warning ( _ ("no one to print a percent"));
     }
@@ -68,7 +58,7 @@ Percent_repeat_iterator::process (Moment m)
 
   if (finish_mom_ <= m )
     {
-      child_iter_->quit(); 
+      child_iter_->quit (); 
       child_iter_ = 0;
     }
 }
@@ -89,8 +79,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);
 }