Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index 17ef87275e1dc2d17342e8326790760253c9321d..79bfcb2fc797aba35c884da3950c06c9f6f2b299 100644 (file)
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -3,15 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "folded-repeat-iterator.hh"
 
+#include "context.hh"
 #include "input.hh"
+#include "international.hh"
 #include "repeated-music.hh"
 #include "simultaneous-music-iterator.hh"
-#include "context.hh"
 
 Folded_repeat_iterator::Folded_repeat_iterator ()
 {
@@ -55,13 +56,6 @@ Folded_repeat_iterator::construct_children ()
 void
 Folded_repeat_iterator::process (Moment m)
 {
-  if (!m.to_bool ())
-    {
-      bool success = try_music (get_music ());
-      if (!success)
-       get_music ()->origin ()->warning (_ ("no one to print a repeat brace"));
-    }
-
   if (main_iter_)
     {
       main_iter_->process (m);
@@ -104,7 +98,7 @@ Folded_repeat_iterator::enter_alternative ()
       */
       Simultaneous_music_iterator *s = new Simultaneous_music_iterator;
       s->create_separate_contexts_ = true;
-      s->init_translator (mus, get_outlet ());
+      s->init_context (mus, get_outlet ());
 
       alternative_iter_ = s;
       alternative_iter_->construct_children ();
@@ -113,15 +107,6 @@ Folded_repeat_iterator::enter_alternative ()
     }
 }
 
-Music_iterator *
-Folded_repeat_iterator::try_music_in_children (Music *m) const
-{
-  if (main_iter_)
-    return main_iter_->try_music (m);
-  if (alternative_iter_)
-    return alternative_iter_->try_music (m);
-  return 0;
-}
 void
 Folded_repeat_iterator::derived_mark () const
 {