* scripts/abc2ly.py (dump_slyrics): add ord().

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 186696b1150cc872a8a99713d775d522e010e01c..ea2805b1c415a3e06288963d2ef91c5f005ee8c1 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,27 +3,27 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "repeated-music.hh"
+
 #include "music-list.hh"
 #include "pitch.hh"
 #include "warn.hh"
-#include "music-sequence.hh"
 #include "scm-option.hh"
 
 Music *
 Repeated_music::body ()const
 {
-  return unsmob_music (get_mus_property ("element"));
+  return unsmob_music (get_property ("element"));
 }
 
 SCM
 Repeated_music::alternatives ()const
 {
-  return get_mus_property ("elements");
+  return get_property ("elements");
 }
 
 
@@ -34,15 +34,17 @@ Repeated_music::to_relative_octave (Pitch p)
 {
   if (lily_1_8_relative)
     {
-      lily_1_8_compatibility_used = true; 
       if (body ())
        p = body ()->to_relative_octave (p);
 
       Pitch last = p ; 
       if (alternatives ())
-       for (SCM s = alternatives (); gh_pair_p (s);  s = ly_cdr (s))
-         unsmob_music (ly_car (s))->to_relative_octave (p);
-     
+       {
+         lily_1_8_compatibility_used = true; 
+
+         for (SCM s = alternatives (); scm_is_pair (s);  s = scm_cdr (s))
+           unsmob_music (scm_car (s))->to_relative_octave (p);
+       }     
 
       return last;
     }
@@ -66,12 +68,12 @@ Repeated_music::alternatives_get_length (bool fold) const
   int done =0;
 
   SCM p = alternatives ();
-  while (gh_pair_p (p) && done < repeat_count ())
+  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;
 }
@@ -88,10 +90,10 @@ Repeated_music::alternatives_volta_get_length () const
 
   Moment m;
   SCM p = alternatives ();
-  while (gh_pair_p (p))
+  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;
 }
@@ -114,7 +116,7 @@ Repeated_music::body_get_length () const
 int
 Repeated_music::repeat_count () const
 {
-  return gh_scm2int (get_mus_property ("repeat-count"));
+  return scm_to_int (get_property ("repeat-count"));
 }
 
 
@@ -163,13 +165,13 @@ SCM
 Repeated_music::minimum_start (SCM m)
 {
   Music * me = unsmob_music (m);
-  Music * body = unsmob_music (me->get_mus_property ("element"));
+  Music * body = unsmob_music (me->get_property ("element"));
 
   if (body)
-    return body->start_mom ().smobbed_copy();
+    return body->start_mom ().smobbed_copy ();
   else
     {
-      return Music_sequence::minimum_start (me->get_mus_property ("elements")).smobbed_copy();
+      return Music_sequence::minimum_start (me->get_property ("elements")).smobbed_copy ();
     }
 }
 
@@ -177,10 +179,10 @@ SCM
 Repeated_music::first_start (SCM m)
 {
   Music * me = unsmob_music (m);
-  Music * body = unsmob_music (me->get_mus_property ("element"));
+  Music * body = unsmob_music (me->get_property ("element"));
 
   Moment rv =  (body) ? body->start_mom () :
-    Music_sequence::first_start (me->get_mus_property ("elements"));
+    Music_sequence::first_start (me->get_property ("elements"));
 
   return rv.smobbed_copy ();
 }