X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=8488259923a031763324c3d588a44a0355a02d19;hb=e166ef4d795f43bcdff1f04162d17c2d8c7a9302;hp=1bbd2be8c25d2f046456e63aa882998a39b3a8b1;hpb=3f7d85a05bd1504266c0dc03c0b3eb5462d878df;p=lilypond.git

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 1bbd2be8c2..8488259923 100644
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,81 +3,167 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "repeated-music.hh"
-#include "musical-pitch.hh"
+#include "music-list.hh"
+#include "pitch.hh"
+#include "debug.hh"
 
-Repeated_music::Repeated_music (Music* r, int n, Music_sequence* a)
+Music *
+Repeated_music::body ()const
 {
-  repeats_i_ = n;
-  unfold_b_ = false;
-  repeat_p_ = r;
-  alternative_p_ = a;
+  return unsmob_music (get_mus_property ("element"));
 }
 
-Repeated_music::~Repeated_music ()
+SCM
+Repeated_music::alternatives ()const
 {
-  delete repeat_p_;
-  delete alternative_p_;
+  return get_mus_property ("elements");
 }
 
-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"));
+}
+
+
+Pitch
+Repeated_music::to_relative_octave (Pitch p)
 {
-  repeat_p_ = (s.repeat_p_) ? s.repeat_p_->clone () : 0;
-  // urg?
-  alternative_p_ = (s.alternative_p_) ? dynamic_cast <Music_sequence*> (s.alternative_p_->clone ()) : 0;
+  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);
+     
+
+  return last;
 }
 
 void
-Repeated_music::do_print () const
+Repeated_music::transpose (Pitch p)
 {
-  if (repeat_p_)
-    repeat_p_->print ();
-  if (alternative_p_)
-    alternative_p_->print ();
+  if (body ())
+    body ()->transpose (p);
+
+  Music_sequence::transpose_list (get_mus_property ("elements"), p);
 }
 
 void
-Repeated_music::transpose (Musical_pitch p)
+Repeated_music::compress (Moment p)
 {
-  if (repeat_p_)
-    repeat_p_->transpose (p);
-  if (alternative_p_)
-    alternative_p_->transpose (p);
+  if (body ())
+    body ()->compress (p);
+
+  Music_sequence::compress_list (alternatives (), p);
 }
 
 Moment
-Repeated_music::duration () const
+Repeated_music::alternatives_length_mom (bool fold) const
 {
+  if (!alternatives ())
+    return 0;
+  
+  if (fold)
+    return Music_sequence::maximum_length (alternatives ());
+
+  Moment m =0;
+  int done =0;
+
+  SCM p = alternatives ();
+  while (gh_pair_p (p) && done < repeat_count ())
+    {
+      m = m + unsmob_music (ly_car (p))->length_mom ();
+      done ++;
+      if (repeat_count () - done < scm_ilength (alternatives ()))
+	p = ly_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;
-  if (repeat_p_)
-    m += repeat_p_->duration ();
-  if (alternative_p_)
-    m += alternative_p_->duration ();
+  SCM p = alternatives ();
+  while (gh_pair_p (p))
+    {
+      m = m + unsmob_music (ly_car (p))->length_mom ();
+      p = ly_cdr (p);
+    }
   return m;
 }
 
 
-Musical_pitch
-Repeated_music::to_relative_octave (Musical_pitch p)
+/*
+  Length of the body in THIS. Disregards REPEAT-COUNT. 
+ */
+Moment
+Repeated_music::body_length_mom () const
+{
+  Moment m = 0;
+  if (body ())
+    {
+      m = body ()->length_mom ();
+    }
+  return m;
+}
+
+int
+Repeated_music::repeat_count () const
 {
-  p = repeat_p_->to_relative_octave (p);
+  return gh_scm2int (get_mus_property ("repeat-count"));
+}
+
 
-  p = alternative_p_->do_relative_octave (p, false); 
-  return p;
+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)
+{
+  Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
   
-  /* ugh.  Should 
-     \relative c'' \repeat 2  { c4 } { < ... > }
+  Moment l = Moment (r->repeat_count ()) * r->body_length_mom () + r->alternatives_length_mom (false);
+  return l.smobbed_copy ();
+}
 
-     and 
-     
-     \relative c'' \repeat 2  { c4 }
-     { { ...} }
+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 ();
+}
 
-     behave differently?
-   */
+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 ();
+}
+
+ADD_MUSIC (Repeated_music);
+
+Repeated_music::Repeated_music ()
+  : Music (SCM_EOL)
+{
+ set_mus_property ("type", ly_symbol2scm ("repeated-music"));
 }