X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffolded-repeat-iterator.cc;h=f22e8b879b323ab82fe45694bf526e805115202c;hb=24a22b6937e74c52e14849225e53bf3160b9218a;hp=3fa42745f518683af0d26c1ccc27cbd0781d0e29;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index 3fa42745f5..f22e8b879b 100644 --- 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 + (c) 1999--2007 Han-Wen Nienhuys */ #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 {