/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2002--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2002--2014 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
Volta_repeat_iterator::derived_mark () const
{
scm_gc_mark (alt_restores_);
+ Sequential_iterator::derived_mark ();
}
SCM
{
if (alt_count_)
{
- string repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
+ string repstr = ::to_string (rep_count_ - alt_count_ + done_count_) + ".";
if (done_count_ <= 1)
{
alt_restores_ = SCM_EOL;
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 (to_boolean (get_outlet ()->get_property ("timing")))
{
- for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p))
- scm_apply_0 (ly_lily_module_constant ("ly:context-set-property!"),
- scm_car (p));
+ add_repeat_command (ly_symbol2scm ("end-repeat"));
+
+ if (to_boolean (get_outlet ()->get_property ("timing")))
+ {
+ for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p))
+ scm_apply_0 (ly_lily_module_constant ("ly:context-set-property!"),
+ scm_car (p));
+ }
}
}
if (done_count_ == 1 && alt_count_ < rep_count_)
- repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_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"),