2003 -> 2004

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 3ae277f8f5d051b392b350f0bef583e1b7642b52..85a1c280bc0cfdf36531569ba779ac6ac5f07310 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,15 +3,16 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 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 "debug.hh"
+#include "warn.hh"
 #include "music-sequence.hh"
+#include "scm-option.hh"
 
 Music *
 Repeated_music::body ()const
@@ -26,48 +27,36 @@ Repeated_music::alternatives ()const
 }
 
 
-Repeated_music::Repeated_music (SCM l)
-  : Music (l)
-{
-  set_mus_property ("type", ly_symbol2scm ("repeated-music"));
-}
 
 
 Pitch
 Repeated_music::to_relative_octave (Pitch p)
 {
-  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);
-     
+  if (lily_1_8_relative)
+    {
+      if (body ())
+       p = body ()->to_relative_octave (p);
 
-  return last;
-}
+      Pitch last = p ; 
+      if (alternatives ())
+       {
+         lily_1_8_compatibility_used = true; 
 
-void
-Repeated_music::transpose (Pitch p)
-{
-  if (body ())
-    body ()->transpose (p);
+         for (SCM s = alternatives (); gh_pair_p (s);  s = ly_cdr (s))
+           unsmob_music (ly_car (s))->to_relative_octave (p);
+       }     
 
-  Music_sequence::transpose_list (get_mus_property ("elements"), p);
+      return last;
+    }
+  else
+    {
+      return Music::to_relative_octave (p);
+    }
 }
 
-void
-Repeated_music::compress (Moment p)
-{
-  if (body ())
-    body ()->compress (p);
-
-  Music_sequence::compress_list (alternatives (), p);
-}
 
 Moment
-Repeated_music::alternatives_length_mom (bool fold) const
+Repeated_music::alternatives_get_length (bool fold) const
 {
   if (!alternatives ())
     return 0;
@@ -81,7 +70,7 @@ Repeated_music::alternatives_length_mom (bool fold) const
   SCM p = alternatives ();
   while (gh_pair_p (p) && done < repeat_count ())
     {
-      m = m + unsmob_music (ly_car (p))->length_mom ();
+      m = m + unsmob_music (ly_car (p))->get_length ();
       done ++;
       if (repeat_count () - done < scm_ilength (alternatives ()))
        p = ly_cdr (p);
@@ -94,7 +83,7 @@ Repeated_music::alternatives_length_mom (bool fold) const
   of volta repeats, where the alternatives are iterated just as they
   were entered.  */
 Moment
-Repeated_music::alternatives_volta_length_mom () const
+Repeated_music::alternatives_volta_get_length () const
 {
   if (!alternatives ())
     return 0;
@@ -103,7 +92,7 @@ Repeated_music::alternatives_volta_length_mom () const
   SCM p = alternatives ();
   while (gh_pair_p (p))
     {
-      m = m + unsmob_music (ly_car (p))->length_mom ();
+      m = m + unsmob_music (ly_car (p))->get_length ();
       p = ly_cdr (p);
     }
   return m;
@@ -114,12 +103,12 @@ Repeated_music::alternatives_volta_length_mom () const
   Length of the body in THIS. Disregards REPEAT-COUNT. 
  */
 Moment
-Repeated_music::body_length_mom () const
+Repeated_music::body_get_length () const
 {
   Moment m = 0;
   if (body ())
     {
-      m = body ()->length_mom ();
+      m = body ()->get_length ();
     }
   return m;
 }
@@ -140,7 +129,7 @@ Repeated_music::unfolded_music_length (SCM m)
 {
   Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
   
-  Moment l = Moment (r->repeat_count ()) * r->body_length_mom () + r->alternatives_length_mom (false);
+  Moment l = Moment (r->repeat_count ()) * r->body_get_length () + r->alternatives_get_length (false);
   return l.smobbed_copy ();
 }
 
@@ -149,7 +138,7 @@ Repeated_music::folded_music_length (SCM m)
 {
   Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
  
-  Moment l =  r->body_length_mom () + r->alternatives_length_mom (true);
+  Moment l =  r->body_get_length () + r->alternatives_get_length (true);
   return l.smobbed_copy ();
 }
 
@@ -157,16 +146,15 @@ SCM
 Repeated_music::volta_music_length (SCM m)
 {
   Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
-  Moment l =  r->body_length_mom () + r->alternatives_volta_length_mom ();
+  Moment l =  r->body_get_length () + r->alternatives_volta_get_length ();
   return l.smobbed_copy ();
 }
 
 ADD_MUSIC (Repeated_music);
 
 Repeated_music::Repeated_music ()
-  : Music (SCM_EOL)
+  : Music ()
 {
- set_mus_property ("type", ly_symbol2scm ("repeated-music"));
 }