X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-repeat-iterator.cc;h=e018fe74b1ca9b09a0e049c689a46ff6e9a5c1ac;hb=c39943f60cffe2084c2f571fa838f0e34f89419b;hp=4df93c8eaa8a281724bf6ccf028bda32a6cdc3b4;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc index 4df93c8eaa..e018fe74b1 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--2005 Han-Wen Nienhuys + (c) 2002--2009 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_) { - 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.to_str0 ()), SCM_UNDEFINED)); + ly_string2scm (repstr), SCM_UNDEFINED)); } else add_repeat_command (ly_symbol2scm ("end-repeat"));