X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-iterator.cc;h=7ba527da5d9aef489d8986046ca658c90810afc9;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=495f30f33cff535e088a5b4d0ccc65a399d4009c;hpb=04265f11d1f21416ccebd2dcaa1d903dc781b36e;p=lilypond.git diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc index 495f30f33c..7ba527da5d 100644 --- a/lily/percent-repeat-iterator.cc +++ b/lily/percent-repeat-iterator.cc @@ -7,20 +7,10 @@ Erik Sandberg */ +#include "percent-repeat-iterator.hh" #include "input.hh" #include "music.hh" #include "repeated-music.hh" -#include "sequential-iterator.hh" - -class Percent_repeat_iterator : public Sequential_iterator -{ -public: - DECLARE_CLASSNAME(Percent_repeat_iterator); - DECLARE_SCHEME_CALLBACK (constructor, ()); - Percent_repeat_iterator (); -protected: - virtual SCM get_music_list () const; -}; IMPLEMENT_CTOR_CALLBACK (Percent_repeat_iterator); @@ -44,11 +34,9 @@ Percent_repeat_iterator::get_music_list () const percent->set_spot (*mus->origin ()); percent->set_property ("length", length); if (repeats > 1) - percent->set_property ("repeat-count", scm_int2num (i)); - + percent->set_property ("repeat-count", scm_int2num (i - 1)); child_list = scm_cons (percent->unprotect (), child_list); } - child_list = scm_cons (child->self_scm (), child_list); return child_list;