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 9e3705608943720eb7f30bebbfd4bc8e5c629ac2..90cdb0dfd40b6cde6b0f284d181dfbc6eda0a6bd 100644 (file)
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -4,10 +4,9 @@
   source file of the GNU LilyPond music typesetter
 
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #include "music.hh"
 #include "sequential-iterator.hh"
 #include "context.hh"
@@ -63,14 +62,14 @@ void
 Volta_repeat_iterator::add_repeat_command (SCM what)
 {
   SCM reps = ly_symbol2scm ("repeatCommands");
-  SCM current_reps = get_outlet ()->internal_get_property (reps);
+  SCM current_reps = SCM_EOL;
+  Context *where = get_outlet ()->where_defined (reps, &current_reps);
 
-  Context *where = get_outlet ()->where_defined (reps);
   if (where
       && 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);
     }
 }
 
@@ -85,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));
@@ -95,18 +94,14 @@ Volta_repeat_iterator::next_element (bool side_effect)
            }
 
          if (done_count_ == 1 && alt_count_ < rep_count_)
-           {
-             repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
-           }
+           repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
 
          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"));
-       }
+       add_repeat_command (ly_symbol2scm ("end-repeat"));
     }
 }