Add penalty to interface.

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

diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index 4c72fcf1b195d1d8e677bedb3ac72e66f0cc05ef..8ec9103eb9f3cfaf8d3eb2870f7cb23308768cb8 100644 (file)
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -3,21 +3,16 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-
-/*
-   Folded repeats are a stupid idea at this point, so we refrain from
-   implementing get_pending_events () and skip ().
-*/
-
+#include "input.hh"
 #include "folded-repeat-iterator.hh"
 #include "repeated-music.hh"
 #include "music-list.hh"
 #include "simultaneous-music-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 Folded_repeat_iterator::Folded_repeat_iterator ()
 {
@@ -31,28 +26,10 @@ Folded_repeat_iterator::ok () const
   return main_iter_ || alternative_iter_;
 }
 void
-Folded_repeat_iterator::do_quit()
-{
-  if (main_iter_)main_iter_->quit();
-  if (alternative_iter_)alternative_iter_->quit();
-}
-
-Folded_repeat_iterator::Folded_repeat_iterator (Folded_repeat_iterator const &src)
-  : Music_iterator (src)
+Folded_repeat_iterator::do_quit ()
 {
-  main_iter_ = 0;
-  alternative_iter_ = 0;
-  main_length_mom_ = src.main_length_mom_;
-
-  if (src.alternative_iter_)
-    alternative_iter_ = src.alternative_iter_->clone ();
-  if (src.main_iter_)
-    main_iter_ = src.main_iter_->clone ();
-  
-  if (main_iter_)
-    scm_gc_unprotect_object (main_iter_->self_scm());
-  if (alternative_iter_)
-    scm_gc_unprotect_object (alternative_iter_->self_scm());
+  if (main_iter_)main_iter_->quit ();
+  if (alternative_iter_)alternative_iter_->quit ();
 }
 
 Moment
@@ -105,7 +82,7 @@ Folded_repeat_iterator::process (Moment m)
       alternative_iter_->process (m - main_length_mom_);
       if (!alternative_iter_->ok ())
        {
-         alternative_iter_->quit();
+         alternative_iter_->quit ();
          alternative_iter_ =0;
        }
     }
@@ -118,7 +95,7 @@ Folded_repeat_iterator::leave_body ()
 
   main_iter_->quit ();
   main_iter_ = 0;
-  main_length_mom_ +=  mus->body ()->length_mom ();
+  main_length_mom_ +=  mus->body ()->get_length ();
 }
 
 void
@@ -127,17 +104,17 @@ Folded_repeat_iterator::enter_alternative ()
   Repeated_music *  mus = dynamic_cast<Repeated_music *> (get_music ());  
   if (mus->alternatives ())
     {
-  /*
-    ugh.
-   */ 
+      /*
+       ugh.
+      */ 
       Simultaneous_music_iterator * s = new Simultaneous_music_iterator;
-      s->separate_contexts_b_ = true;
-      s->init_translator (mus, report_to ());
+      s->create_separate_contexts_ = true;
+      s->init_translator (mus, get_outlet ());
       
       alternative_iter_ = s;
       alternative_iter_->construct_children ();
 
-      scm_gc_unprotect_object (s->self_scm());
+      scm_gc_unprotect_object (s->self_scm ());
     }
 }
 
@@ -154,11 +131,21 @@ Folded_repeat_iterator::try_music_in_children (Music * m) const
   return 0;
 }
 void
-Folded_repeat_iterator::derived_mark()const
+Folded_repeat_iterator::derived_mark ()const
 {
   if (main_iter_)
-    scm_gc_mark (main_iter_->self_scm());
+    scm_gc_mark (main_iter_->self_scm ());
   if (alternative_iter_)
-    scm_gc_mark (alternative_iter_->self_scm());
+    scm_gc_mark (alternative_iter_->self_scm ());
 }
+
+void
+Folded_repeat_iterator::derived_substitute (Context *f, Context *t) 
+{
+  if (main_iter_)
+    main_iter_->substitute_outlet (f,t);
+  if (alternative_iter_)
+    alternative_iter_->substitute_outlet (f,t);
+}
+
 IMPLEMENT_CTOR_CALLBACK (Folded_repeat_iterator);