X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Funfolded-repeat-iterator.cc;h=04bb8005013b6467aed58a25e694259c56dcdeb0;hb=42c8f04fe971525561dde0ee757ffebe3e6c0703;hp=db5f81cc67e12a4d9c4e528867ce688917f598ed;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index db5f81cc67..04bb800501 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -7,7 +7,6 @@ source file of the GNU LilyPond music typesetter (c) 2002--2004 Han-Wen Nienhuys */ - #include "music.hh" #include "sequential-iterator.hh" #include "context.hh" @@ -41,11 +40,11 @@ Unfolded_repeat_iterator::get_music_list () const if (alt_count) { - *tail = scm_cons (ly_car (alts), SCM_EOL); + *tail = scm_cons (scm_car (alts), SCM_EOL); tail = SCM_CDRLOC (*tail); if (i >= rep_count - alt_count) - alts = ly_cdr (alts); + alts = scm_cdr (alts); } } @@ -74,7 +73,7 @@ protected: Volta_repeat_iterator::Volta_repeat_iterator () { - done_count_ = alt_count_ = rep_count_= 0; + done_count_ = alt_count_ = rep_count_ = 0; first_time_ = true; }