/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2001--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2001--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Erik Sandberg <mandolaerik@gmail.com>
LilyPond is free software: you can redistribute it and/or modify
#include "input.hh"
#include "repeated-music.hh"
#include "sequential-iterator.hh"
+#include "lily-imports.hh"
class Percent_repeat_iterator : public Sequential_iterator
{
Percent_repeat_iterator::get_music_list () const
{
Music *mus = get_music ();
+
Music *child = Repeated_music::body (mus);
SCM length = child->get_length ().smobbed_copy ();
SCM child_list = SCM_EOL;
event_type = "DoublePercentEvent";
else
{
- slash_count
- = scm_call_1 (ly_lily_module_constant ("calc-repeat-slash-count"),
- child->self_scm ());
+ slash_count = Lily::calc_repeat_slash_count (child->self_scm ());
event_type = "RepeatSlashEvent";
}
int repeats = scm_to_int (mus->get_property ("repeat-count"));
for (int i = repeats; i > 1; i--)
- {
- Music *percent = make_music_by_name (ly_symbol2scm (event_type.c_str ()));
- percent->set_spot (*mus->origin ());
- percent->set_property ("length", length);
- if (repeats > 1)
- {
- percent->set_property ("repeat-count", scm_from_int (i));
- if (event_type == "RepeatSlashEvent")
- percent->set_property ("slash-count", slash_count);
- }
-
- child_list = scm_cons (percent->unprotect (), child_list);
- }
+ {
+ Music *percent = make_music_by_name (ly_symbol2scm (event_type.c_str ()));
+ percent->set_spot (*mus->origin ());
+ percent->set_property ("length", length);
+ if (repeats > 1)
+ {
+ percent->set_property ("repeat-count", scm_from_int (i));
+ if (event_type == "RepeatSlashEvent")
+ percent->set_property ("slash-count", slash_count);
+ }
+
+ child_list = scm_cons (percent->unprotect (), child_list);
+ }
child_list = scm_cons (child->self_scm (), child_list);