X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-repeat-iterator.cc;h=b7ac2059f14964e33260d4f28d6d1b1499d9c251;hb=e94c4a66c9d565749d8a121fc0267ddeb423ca13;hp=c8132638f7d72788f2428c2ae8c7c8a7fc408e68;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index c8132638f7..b7ac2059f1 100644
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -1,10 +1,20 @@
 /*
-  volta-repeat-iterator.cc -- implement Volta_repeat_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "music.hh"
@@ -66,10 +76,10 @@ Volta_repeat_iterator::add_repeat_command (SCM what)
   Context *where = get_outlet ()->where_defined (reps, &current_reps);
 
   if (where
-      && current_reps == SCM_EOL || scm_is_pair (current_reps))
+       && (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 +94,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));
@@ -94,18 +104,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"));
     }
 }