X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-repeat-iterator.cc;h=23f8edd9c5e2fb76be3240e9f8d1edbef7d392f6;hb=5d541f9872bb301bc1b08d621fb2e4cb7b5421c8;hp=8ff30631ea07a41e82ce0d0b38ede910cf5066a0;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc index 8ff30631ea..23f8edd9c5 100644 --- a/lily/volta-repeat-iterator.cc +++ b/lily/volta-repeat-iterator.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2002--2006 Han-Wen Nienhuys + (c) 2002--2007 Han-Wen Nienhuys */ #include "music.hh" @@ -69,7 +69,7 @@ Volta_repeat_iterator::add_repeat_command (SCM what) && current_reps == SCM_EOL || scm_is_pair (current_reps)) { current_reps = scm_cons (what, current_reps); - where->internal_set_property (reps, current_reps); + where->set_property (reps, current_reps); } } @@ -84,7 +84,7 @@ Volta_repeat_iterator::next_element (bool side_effect) { if (alt_count_) { - std::string repstr = to_string (rep_count_ - alt_count_ + done_count_) + "."; + string repstr = to_string (rep_count_ - alt_count_ + done_count_) + "."; if (done_count_ > 1) { add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED)); @@ -98,7 +98,7 @@ Volta_repeat_iterator::next_element (bool side_effect) if (done_count_ <= alt_count_) add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), - scm_makfrom0str (repstr.c_str ()), SCM_UNDEFINED)); + ly_string2scm (repstr), SCM_UNDEFINED)); } else add_repeat_command (ly_symbol2scm ("end-repeat"));