Run `make grand-replace'.

[lilypond.git] / lily / volta-repeat-iterator.cc

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index 8ff30631ea07a41e82ce0d0b38ede910cf5066a0..90cdb0dfd40b6cde6b0f284d181dfbc6eda0a6bd 100644 (file)
--- 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 <hanwen@xs4all.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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"));