X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Funfolded-repeat-iterator.cc;h=04bb8005013b6467aed58a25e694259c56dcdeb0;hb=810defa88e1c382cf3bb1715a77b883d0b1c85a0;hp=0dd91b2352428af70e9e4a4a3bd7cf5f1ab85694;hpb=ba858880848d6aca1de4401d185860eb2017a01c;p=lilypond.git

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 0dd91b2352..04bb800501 100644
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -7,7 +7,6 @@ source file of the GNU LilyPond music typesetter
 (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #include "music.hh"
 #include "sequential-iterator.hh"
 #include "context.hh"
@@ -30,7 +29,7 @@ Unfolded_repeat_iterator::get_music_list () const
   SCM body = get_music ()->get_property ("element");
   SCM alts = get_music ()->get_property ("elements");
   int alt_count = scm_ilength (alts);
-  int rep_count = ly_scm2int (get_music ()->get_property ("repeat-count"));
+  int rep_count = scm_to_int (get_music ()->get_property ("repeat-count"));
 
   for (int i = 0; i < rep_count; i++)
     {
@@ -41,11 +40,11 @@ Unfolded_repeat_iterator::get_music_list () const
 
       if (alt_count)
 	{
-	  *tail = scm_cons (ly_car (alts), SCM_EOL);
+	  *tail = scm_cons (scm_car (alts), SCM_EOL);
 	  tail = SCM_CDRLOC (*tail);
 	  if (i >= rep_count - alt_count)
 	    
-	    alts = ly_cdr (alts);
+	    alts = scm_cdr (alts);
 	}      
     }
 
@@ -74,7 +73,7 @@ protected:
 
 Volta_repeat_iterator::Volta_repeat_iterator ()
 {
-  done_count_ = alt_count_ = rep_count_= 0;
+  done_count_ = alt_count_ = rep_count_ = 0;
   first_time_ = true;
 }
 
@@ -93,7 +92,7 @@ Volta_repeat_iterator::construct_children ()
   SCM alts = get_music ()->get_property ("elements");
 
   alt_count_ = scm_ilength (alts);
-  rep_count_ = ly_scm2int (get_music ()->get_property ("repeat-count"));
+  rep_count_ = scm_to_int (get_music ()->get_property ("repeat-count"));
   done_count_ = 0;
 }
 
@@ -109,7 +108,7 @@ Volta_repeat_iterator::add_repeat_command (SCM what)
 
   Context * where = get_outlet ()->where_defined (reps);
   if (where
-      && current_reps == SCM_EOL || ly_c_pair_p (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);