patch::: 1.3.130.jcn1

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 2e8e0e3d0204ece0397d25e1b17a86c6d2ffebd6..5785e114cff6742a68141c84b4c1efce2cf4b8d0 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -9,7 +9,7 @@
 
 #include "repeated-music.hh"
 #include "music-list.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 #include "debug.hh"
 
 Music *
@@ -24,50 +24,20 @@ Repeated_music::alternatives ()const
   return dynamic_cast<Music_sequence*>  (unsmob_music (get_mus_property ("alternatives")));
 }
 
-Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts)
+Repeated_music::Repeated_music(SCM l)
+  : Music (l)
 {
-  set_mus_property ("body", beg->self_scm ());
-  fold_b_ = false;
-  repeats_i_ = times;
-  volta_fold_b_ = true;
-  if (alts)
-    {
-      alts->truncate (times);
-      set_mus_property ("alternatives", alts->self_scm ());
-    }
-}
-
-Repeated_music::Repeated_music (Repeated_music const &s)
-  : Music (s)
-{
-  repeats_i_ = s.repeats_i_;
-  fold_b_ = s.fold_b_;
-  volta_fold_b_ = s.volta_fold_b_;
-  type_ = s.type_;
+  set_mus_property ("type", ly_symbol2scm ("repeated-music"));
 }
 
 
-void
-Repeated_music::do_print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << "Fold = " << fold_b_ << " reps: " << repeats_i_;
-
-  if (body ())
-    body ()->print();
-  
-  if (alternatives ())
-    alternatives ()->print();
-#endif
-}
-
-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);
@@ -77,7 +47,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);
@@ -97,24 +67,43 @@ Repeated_music::compress (Moment p)
 }
 
 Moment
-Repeated_music::alternatives_length_mom () const
+Repeated_music::alternatives_length_mom (bool fold) const
 {
   if (!alternatives () )
     return 0;
   
-  if  (fold_b_)
+  if  (fold)
     return alternatives ()->maximum_length ();
 
   Moment m =0;
   int done =0;
 
   SCM p = alternatives ()->music_list ();
-   while (gh_pair_p (p) && done < repeats_i_)
+  while (gh_pair_p (p) && done < repeat_count ())
     {
       m = m + unsmob_music (gh_car (p))->length_mom ();
       done ++;
-      if (volta_fold_b_
-         || repeats_i_ - done < alternatives ()->length_i ())
+      if (repeat_count () - done < alternatives ()->length_i ())
+       p = gh_cdr (p);
+    }
+  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;
@@ -127,15 +116,43 @@ Repeated_music::body_length_mom () const
   if (body ())
     {
       m = body ()->length_mom ();
-      if (!fold_b_ && !volta_fold_b_)
-       m *= Rational (repeats_i_);
     }
   return m;
 }
 
-Moment
-Repeated_music::length_mom () const
+int
+Repeated_music::repeat_count () const
+{
+  return gh_scm2int (get_mus_property ("repeat-count"));
+}
+
+
+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)
 {
-  return body_length_mom () + alternatives_length_mom ();
+  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);
+  return l.smobbed_copy ();
 }
 
+SCM
+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);
+  return l.smobbed_copy ();
+}
+
+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 ();
+  return l.smobbed_copy ();
+}