* Documentation/user/notation.itely (Bar lines): Added a note that

[lilypond.git] / lily / repeated-music.cc

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index b235e8c29d82c7c2074516356597a9637d6783c4..8d76ae78a83509941c703715480bf1f2b4adf9e9 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -42,8 +42,8 @@ Repeated_music::to_relative_octave (Pitch p)
        {
          lily_1_8_compatibility_used = true; 
 
-         for (SCM s = alternatives (); scm_is_pair (s);  s = ly_cdr (s))
-           unsmob_music (ly_car (s))->to_relative_octave (p);
+         for (SCM s = alternatives (); scm_is_pair (s);  s = scm_cdr (s))
+           unsmob_music (scm_car (s))->to_relative_octave (p);
        }     
 
       return last;
@@ -70,10 +70,10 @@ Repeated_music::alternatives_get_length (bool fold) const
   SCM p = alternatives ();
   while (scm_is_pair (p) && done < repeat_count ())
     {
-      m = m + unsmob_music (ly_car (p))->get_length ();
+      m = m + unsmob_music (scm_car (p))->get_length ();
       done ++;
       if (repeat_count () - done < scm_ilength (alternatives ()))
-       p = ly_cdr (p);
+       p = scm_cdr (p);
     }
   return m;
 }
@@ -92,8 +92,8 @@ Repeated_music::alternatives_volta_get_length () const
   SCM p = alternatives ();
   while (scm_is_pair (p))
     {
-      m = m + unsmob_music (ly_car (p))->get_length ();
-      p = ly_cdr (p);
+      m = m + unsmob_music (scm_car (p))->get_length ();
+      p = scm_cdr (p);
     }
   return m;
 }