source file of the GNU LilyPond music typesetter
- (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
delete alternative_iter_p_;
}
+Folded_repeat_iterator::Folded_repeat_iterator (Folded_repeat_iterator const &src)
+ : Music_iterator (src)
+{
+ main_iter_p_ = src.main_iter_p_ ? src.main_iter_p_->clone () : 0;
+ alternative_iter_p_ = src.alternative_iter_p_ ? src.alternative_iter_p_->clone () : 0;
+ main_length_mom_ = src.main_length_mom_;
+}
+
Moment
Folded_repeat_iterator::pending_moment () const
{
void
Folded_repeat_iterator::construct_children ()
{
- Repeated_music * mus = dynamic_cast<Repeated_music*> (music_l_);
+ Repeated_music * mus = dynamic_cast<Repeated_music*> (music_l ());
main_iter_p_ = get_iterator_p (mus->body ());
- if (!main_iter_p_->ok())
+ if (!main_iter_p_->ok ())
{
- leave_body ();
+ leave_body ();
enter_alternative ();
}
}
void
Folded_repeat_iterator::process (Moment m)
{
- if (!m)
+ if (!m.to_bool () )
{
- bool success = try_music (music_l_);
+ bool success = try_music (music_l ());
if (!success)
- music_l_->origin ()->warning ( _("no one to print a repeat brace"));
+ music_l ()->origin ()->warning (_ ("no one to print a repeat brace"));
}
if (main_iter_p_)
void
Folded_repeat_iterator::leave_body ()
{
- Repeated_music * mus = dynamic_cast<Repeated_music *> (music_l_);
+ Repeated_music * mus = dynamic_cast<Repeated_music *> (music_l ());
delete main_iter_p_;
main_iter_p_ = 0;
main_length_mom_ += mus->body ()->length_mom ();
void
Folded_repeat_iterator::enter_alternative ()
{
- Repeated_music * mus = dynamic_cast<Repeated_music *> (music_l_);
+ Repeated_music * mus = dynamic_cast<Repeated_music *> (music_l ());
if (mus->alternatives ())
{
Simultaneous_music_iterator * s = new Simultaneous_music_iterator;
s->separate_contexts_b_ = true;
- s->init_translator (mus->alternatives (), report_to_l ());
-
+ s->init_translator (mus, report_to_l ());
+
alternative_iter_p_ = s;
alternative_iter_p_->construct_children ();
}
return 0;
}
-IMPLEMENT_CTOR_CALLBACK(Folded_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Folded_repeat_iterator);