/*
- volta-repeat-iterator.cc -- implement Volta_repeat_iterator
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2002--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ 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.
- (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ 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.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "music.hh"
Volta_repeat_iterator::get_music_list ()const
{
return scm_cons (get_music ()->get_property ("element"),
- get_music ()->get_property ("elements"));
+ Sequential_iterator::get_music_list ());
}
void
SCM alts = get_music ()->get_property ("elements");
- alt_count_ = scm_ilength (alts);
+ alt_count_ = int (scm_ilength (alts));
rep_count_ = scm_to_int (get_music ()->get_property ("repeat-count"));
done_count_ = 0;
}
Context *where = get_outlet ()->where_defined (reps, ¤t_reps);
if (where
- && current_reps == SCM_EOL || scm_is_pair (current_reps))
+ && (current_reps == SCM_EOL || scm_is_pair (current_reps)))
{
current_reps = scm_cons (what, current_reps);
where->set_property (reps, current_reps);
if (side_effect)
{
if (alt_count_)
- {
- string repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
- if (done_count_ > 1)
- {
- add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
-
- if (done_count_ - 1 < alt_count_)
- add_repeat_command (ly_symbol2scm ("end-repeat"));
- }
-
- if (done_count_ == 1 && alt_count_ < rep_count_)
- repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
-
- if (done_count_ <= alt_count_)
- add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
- ly_string2scm (repstr), SCM_UNDEFINED));
- }
+ {
+ string repstr = ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
+ if (done_count_ > 1)
+ {
+ add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
+
+ if (done_count_ - 1 < alt_count_)
+ add_repeat_command (ly_symbol2scm ("end-repeat"));
+ }
+
+ if (done_count_ == 1 && alt_count_ < rep_count_)
+ repstr = "1.--" + ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
+
+ if (done_count_ <= alt_count_)
+ add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
+ ly_string2scm (repstr), SCM_UNDEFINED));
+ }
else
- add_repeat_command (ly_symbol2scm ("end-repeat"));
+ add_repeat_command (ly_symbol2scm ("end-repeat"));
}
}