release: 1.3.146

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 6f2a0913befc73cc86c61552788aac4c59c3c706..3935cc3a1d4dc89cbfdb884467d018d8ffc108ab 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,13 +3,13 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "repeated-music.hh"
 #include "music-list.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 #include "debug.hh"
 
 Music *
@@ -21,40 +21,24 @@ Repeated_music::body ()const
 Music_sequence*
 Repeated_music::alternatives ()const
 {
-  return dynamic_cast<Music_sequence*>  (unsmob_music (get_mus_property ("alternatives")));
+  return dynamic_cast<Music_sequence*> (unsmob_music (get_mus_property ("alternatives")));
 }
 
-Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts)
-{
-  if (beg)
-    {
-      set_mus_property ("body", beg->self_scm ());
-      scm_unprotect_object (beg->self_scm ());
-    }
-  set_mus_property ("repeat-count", gh_int2scm (times));
 
-  if (alts)
-    {
-      alts->truncate (times);
-      set_mus_property ("alternatives", alts->self_scm ());
-      scm_unprotect_object (alts->self_scm ());  
-    }
-  set_mus_property ("type", ly_symbol2scm ("repeated-music"));
-}
-
-Repeated_music::Repeated_music (Repeated_music const &s)
-  : Music (s)
+Repeated_music::Repeated_music (SCM l)
+  : Music (l)
 {
+  set_mus_property ("type", ly_symbol2scm ("repeated-music"));
 }
 
 
-Musical_pitch
-Repeated_music::to_relative_octave (Musical_pitch p)
+Pitch
+Repeated_music::to_relative_octave (Pitch p)
 {
   if (body ())
     p = body ()->to_relative_octave (p);
 
-  Musical_pitch last = p ; 
+  Pitch last = p ; 
   if (alternatives ())
     for (SCM s = alternatives ()->music_list (); gh_pair_p (s);  s = gh_cdr (s))
       unsmob_music (gh_car (s))->to_relative_octave (p);
@@ -64,7 +48,7 @@ Repeated_music::to_relative_octave (Musical_pitch p)
 }
 
 void
-Repeated_music::transpose (Musical_pitch p)
+Repeated_music::transpose (Pitch p)
 {
   if (body ())
     body ()->transpose (p);
@@ -86,10 +70,10 @@ Repeated_music::compress (Moment p)
 Moment
 Repeated_music::alternatives_length_mom (bool fold) const
 {
-  if (!alternatives () )
+  if (!alternatives ())
     return 0;
   
-  if  (fold)
+  if (fold)
     return alternatives ()->maximum_length ();
 
   Moment m =0;
@@ -106,6 +90,30 @@ Repeated_music::alternatives_length_mom (bool fold) const
   return m;
 }
 
+/*
+  Sum all duration of all available alternatives. This is for the case
+  of volta repeats, where the alternatives are iterated just as they
+  were entered.  */
+Moment
+Repeated_music::alternatives_volta_length_mom () const
+{
+  if (!alternatives ())
+    return 0;
+
+  Moment m;
+  SCM p = alternatives ()->music_list ();
+  while (gh_pair_p (p))
+    {
+      m = m + unsmob_music (gh_car (p))->length_mom ();
+      p = gh_cdr (p);
+    }
+  return m;
+}
+
+
+/*
+  Length of the body in THIS. Disregards REPEAT-COUNT. 
+ */
 Moment
 Repeated_music::body_length_mom () const
 {
@@ -124,9 +132,9 @@ Repeated_music::repeat_count () const
 }
 
 
-MAKE_SCHEME_CALLBACK(Repeated_music,unfolded_music_length, 1);
-MAKE_SCHEME_CALLBACK(Repeated_music,folded_music_length, 1);
-MAKE_SCHEME_CALLBACK(Repeated_music,volta_music_length, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,unfolded_music_length, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,folded_music_length, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,volta_music_length, 1);
 
 SCM
 Repeated_music::unfolded_music_length (SCM m)
@@ -150,6 +158,14 @@ 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_length_mom (false);
+  Moment l =  r->body_length_mom () + r->alternatives_volta_length_mom ();
   return l.smobbed_copy ();
 }
+
+ADD_MUSIC (Repeated_music);
+
+Repeated_music::Repeated_music ()
+  : Music (SCM_EOL)
+{
+ set_mus_property ("type", ly_symbol2scm ("repeated-music"));
+}