/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2002--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2002--2015 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
#include "music.hh"
#include "sequential-iterator.hh"
#include "context.hh"
+#include "lily-imports.hh"
class Volta_repeat_iterator : public Sequential_iterator
{
Volta_repeat_iterator::derived_mark () const
{
scm_gc_mark (alt_restores_);
+ Sequential_iterator::derived_mark ();
}
SCM
SCM current_reps = SCM_EOL;
Context *where = get_outlet ()->where_defined (reps, ¤t_reps);
- if (where
- && (current_reps == SCM_EOL || scm_is_pair (current_reps)))
+ if (where && ly_cheap_is_list (current_reps))
{
current_reps = scm_cons (what, current_reps);
where->set_property (reps, current_reps);
{
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;
else
{
- add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
+ add_repeat_command (scm_list_2 (ly_symbol2scm ("volta"), SCM_BOOL_F));
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")))
+ {
+ SCM mps = ly_symbol2scm ("measurePosition");
+ for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p))
+ {
+ SCM ls = scm_car (p);
+ if (scm_is_eq (scm_cadr (ls), mps))
+ // Repeats may have different grace timing, so
+ // we need to adjust the measurePosition grace
+ // timing to that of the current alternative
+ // rather than that of the first. The
+ // Timing_translator does this already but is
+ // too late to avoid bad side-effects
+ {
+ Moment mp (unsmob<Moment> (scm_caddr (ls))->main_part_,
+ get_outlet ()->now_mom ().grace_part_);
+ Lily::ly_context_set_property_x (scm_car (ls),
+ mps,
+ mp.smobbed_copy ());
+ }
+ else
+ scm_apply_0 (Lily::ly_context_set_property_x, ls);
+ }
+ }
}
}
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"),
- ly_string2scm (repstr), SCM_UNDEFINED));
+ add_repeat_command (scm_list_2 (ly_symbol2scm ("volta"),
+ ly_string2scm (repstr)));
}
else
add_repeat_command (ly_symbol2scm ("end-repeat"));