X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Funfolded-repeat-iterator.cc;h=976861fa8bb16eea9b05c36b40e7d69e5a6b6d1e;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f9ac9ea0c451a35172ef5dc58ff7c1fb1c132ff2;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index f9ac9ea0c4..976861fa8b 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -1,275 +1,63 @@ -/* - unfolded-repeat-iterator.cc -- implement Unfolded_repeat_iterator - - source file of the GNU LilyPond music typesetter - - (c) 1999--2000 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + Copyright (C) 2002--2015 Han-Wen Nienhuys -#include "repeated-music.hh" -#include "music-list.hh" -#include "unfolded-repeat-iterator.hh" -#include "debug.hh" -#include "translator-group.hh" + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -Unfolded_repeat_iterator::~Unfolded_repeat_iterator () -{ - delete current_iter_p_; -} - -Unfolded_repeat_iterator::Unfolded_repeat_iterator () -{ - done_count_ =0; - current_iter_p_ =0; - do_main_b_ = false; - alternative_count_i_ =0; -} - -/** - -If we are in the body of the repeat always go to the current alternative. - -If we are not in the body, then we are in an alternative. If we are -fully unfolding, advance the current alternative and go back to main. -If we are semi-unfolding, advance the current alternative, and go to -the alternative just set. - - */ -void -Unfolded_repeat_iterator::next_element (bool side_effect) -{ - Repeated_music * repmus =dynamic_cast (music_l_); - delete current_iter_p_; - current_iter_p_ =0; - - bool do_repcommands = side_effect && repmus->volta_fold_b_; - - if (do_main_b_) - { - /* - we were busy doing the main body, so - - - go to alternative if we're a volta - - - do something intelligent when we're fully unfolding (fixcomment) - */ - - here_mom_ += repmus->body ()->length_mom (); - - if (!repmus->volta_fold_b_) - done_count_ ++; - - if (gh_pair_p (alternative_cons_)) - { - current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_))); - do_main_b_ = false; - - if (repmus->volta_fold_b_) - { - String repstr = to_str (done_count_ + 1); - if (do_repcommands) - add_repeat_command (gh_list (ly_symbol2scm ("volta"), - ly_str02scm (repstr.ch_C()), SCM_UNDEFINED)); - } - } - else if (done_count_ < repmus->repeats_i_ && !repmus->volta_fold_b_) - { - current_iter_p_ = get_iterator_p (repmus->body ()); - do_main_b_ = true; - } - } - else - { - /* - we're not in the main part. So we're either in an alternative, or - we just finished. - */ - - /* - we're in the alternatives. We move the pointer to the - next alternative. - */ - if (alternative_cons_) - { - here_mom_ += unsmob_music (gh_car (alternative_cons_))->length_mom (); - - if (repmus->volta_fold_b_ || - repmus->repeats_i_ - done_count_ < alternative_count_i_) - alternative_cons_ = gh_cdr (alternative_cons_); - - if (do_repcommands) - add_repeat_command (gh_list (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED)); - - - - /* - we've done the main body as well, but didn't go over the other - increment. */ - if (repmus->volta_fold_b_) - done_count_ ++; - } - - /* - We still have alternatives left, so - - if we're volta: traverse them - - if we're full unfold: go back to main body. - */ - - if (done_count_ < repmus->repeats_i_ && gh_pair_p (alternative_cons_)) - { - if (do_repcommands) - { - String repstr = to_str (done_count_ + 1); - add_repeat_command (gh_list (ly_symbol2scm ("volta"), - ly_str02scm (repstr.ch_C()), SCM_UNDEFINED)); - add_repeat_command (ly_symbol2scm ("end-repeat")); - } - - - if (repmus->volta_fold_b_) - current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_))); - else - { - current_iter_p_ = get_iterator_p (repmus->body ()); - do_main_b_ = true; - } - } - } -} - - -bool -Unfolded_repeat_iterator::ok () const -{ - return current_iter_p_ ; -} - -Moment -Unfolded_repeat_iterator::pending_moment () const -{ - return here_mom_ + current_iter_p_->pending_moment (); -} - -void -Unfolded_repeat_iterator::construct_children () -{ - Repeated_music * mus =dynamic_cast (music_l_); - - alternative_cons_ = (mus->alternatives ()) - ? mus->alternatives ()->music_list () - : SCM_EOL; + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - for (SCM p = alternative_cons_; gh_pair_p (p); p = gh_cdr (p)) - alternative_count_i_ ++; + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ - if (mus->body ()) - { - current_iter_p_ = get_iterator_p (mus->body ()); - do_main_b_ = true; - } - else if (gh_pair_p (alternative_cons_)) - { - current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_))); - do_main_b_ = false; - } -} +#include "music.hh" +#include "sequential-iterator.hh" +#include "context.hh" -void -Unfolded_repeat_iterator::add_repeat_command (SCM what) +class Unfolded_repeat_iterator : public Sequential_iterator { - SCM reps = ly_symbol2scm ("repeatCommands"); - SCM current_reps = report_to_l ()->get_property(reps); - - Translator_group * where = report_to_l ()->where_defined (reps); - if (where - && current_reps == SCM_EOL || gh_pair_p (current_reps)) - { - current_reps = gh_cons (what, current_reps); - where->set_property (reps, current_reps); - } -} +public: + DECLARE_SCHEME_CALLBACK (constructor, ()); +protected: + virtual SCM get_music_list () const; +}; -void -Unfolded_repeat_iterator::process (Moment m) +SCM +Unfolded_repeat_iterator::get_music_list () const { - if (!m) - { - if (dynamic_cast (music_l_)->volta_fold_b_) - add_repeat_command (ly_symbol2scm ("start-repeat")); - } - while (1) - { - while (!current_iter_p_->ok ()) - { - next_element(true); + SCM l = SCM_EOL; + SCM *tail = &l; - if (!current_iter_p_) - return; - } - - if (m - here_mom_ >= current_iter_p_->pending_moment ()) - current_iter_p_->process (m - here_mom_); - else - return; - } -} + SCM body = get_music ()->get_property ("element"); + SCM alts = get_music ()->get_property ("elements"); + int alt_count = scm_ilength (alts); + int rep_count = scm_to_int (get_music ()->get_property ("repeat-count")); -void -Unfolded_repeat_iterator::skip (Moment until) -{ - while (current_iter_p_) + for (int i = 0; i < rep_count; i++) { - Moment l =current_iter_p_->music_length_mom (); - if (l >= until - here_mom_) - current_iter_p_->skip (until - here_mom_); + if (Music::is_smob (body)) + *tail = scm_cons (body, SCM_EOL); - if (current_iter_p_->ok ()) - return ; + tail = SCM_CDRLOC (*tail); - next_element (false); - } -} + if (alt_count) + { + *tail = scm_cons (scm_car (alts), SCM_EOL); + tail = SCM_CDRLOC (*tail); + if (i >= rep_count - alt_count) -SCM -Unfolded_repeat_iterator::get_music (Moment until)const -{ - SCM s = SCM_EOL; - if (until < pending_moment ()) - return s; - - - Unfolded_repeat_iterator * me - = dynamic_cast (this->clone ()); - - while (me->ok ()) - { - SCM nm = me->current_iter_p_->get_music (until - - me->here_mom_); - - s = gh_append2 (nm, s); - - Moment m = 0; - for (SCM i = nm; gh_pair_p(i); i = gh_cdr (i)) - m = m >? unsmob_music (gh_car (i))->length_mom (); - - if (m > Moment (0)) - break ; - else - me->next_element (false); + alts = scm_cdr (alts); + } } - delete me; - - return s; + return l; } - -Music_iterator* -Unfolded_repeat_iterator::try_music_in_children (Music * m) const -{ - return current_iter_p_->try_music (m); -} +IMPLEMENT_CTOR_CALLBACK (Unfolded_repeat_iterator);