X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=37bcfd3de9e5861dbdb4d2c79e0b138ad20625d1;hb=1e66bfb9ec0ebc1b7c09ad9f2256bd77f2230269;hp=e0692aca8a5d53ce30a0307e2be7b25b5269afb5;hpb=2b3853cd624f78756ba0f891fe220776a496d288;p=lilypond.git

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index e0692aca8a..37bcfd3de9 100644
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,62 +3,186 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "repeated-music.hh"
-#include "musical-pitch.hh"
+#include "music-list.hh"
+#include "pitch.hh"
+#include "warn.hh"
+#include "music-sequence.hh"
+#include "scm-option.hh"
 
-//Repeated_music::Repeated_music (Music* r, int n, Music_list* a)
-Repeated_music::Repeated_music (Music* r, int n, Music_sequence* a)
+Music *
+Repeated_music::body ()const
 {
-  repeats_i_ = n;
-  repeat_p_ = r;
-  alternative_p_ = a;
+  return unsmob_music (get_property ("element"));
 }
 
-Repeated_music::~Repeated_music ()
+SCM
+Repeated_music::alternatives ()const
 {
-  delete repeat_p_;
-  delete alternative_p_;
+  return get_property ("elements");
 }
 
-Repeated_music::Repeated_music (Repeated_music const& s)
-  : Music (s)
+
+
+
+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_list*> (s.alternative_p_->clone ()) : 0;
-  alternative_p_ = (s.alternative_p_) ? dynamic_cast <Music_sequence*> (s.alternative_p_->clone ()) : 0;
+  if (lily_1_8_relative)
+    {
+      if (body ())
+	p = body ()->to_relative_octave (p);
+
+      Pitch last = p ; 
+      if (alternatives ())
+	{
+	  lily_1_8_compatibility_used = true; 
+
+	  for (SCM s = alternatives (); gh_pair_p (s);  s = ly_cdr (s))
+	    unsmob_music (ly_car (s))->to_relative_octave (p);
+	}     
+
+      return last;
+    }
+  else
+    {
+      return Music::to_relative_octave (p);
+    }
 }
 
-void
-Repeated_music::do_print () const
+
+Moment
+Repeated_music::alternatives_get_length (bool fold) const
 {
-  if (repeat_p_)
-    repeat_p_->print ();
-  if (alternative_p_)
-    alternative_p_->print ();
+  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))->get_length ();
+      done ++;
+      if (repeat_count () - done < scm_ilength (alternatives ()))
+	p = ly_cdr (p);
+    }
+  return m;
 }
 
-void
-Repeated_music::transpose (Musical_pitch p)
+/*
+  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_get_length () const
 {
-  if (repeat_p_)
-    repeat_p_->transpose (p);
-  if (alternative_p_)
-    alternative_p_->transpose (p);
+  if (!alternatives ())
+    return 0;
+
+  Moment m;
+  SCM p = alternatives ();
+  while (gh_pair_p (p))
+    {
+      m = m + unsmob_music (ly_car (p))->get_length ();
+      p = ly_cdr (p);
+    }
+  return m;
 }
 
+
+/*
+  Length of the body in THIS. Disregards REPEAT-COUNT. 
+ */
 Moment
-Repeated_music::duration () const
+Repeated_music::body_get_length () const
 {
-  Moment m;
-  if (repeat_p_)
-    m += repeat_p_->duration ();
-  if (alternative_p_)
-    m += alternative_p_->duration ();
+  Moment m = 0;
+  if (body ())
+    {
+      m = body ()->get_length ();
+    }
   return m;
 }
 
+int
+Repeated_music::repeat_count () const
+{
+  return gh_scm2int (get_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)
+{
+  Repeated_music* r = dynamic_cast<Repeated_music*> (unsmob_music (m));
+  
+  Moment l = Moment (r->repeat_count ()) * r->body_get_length () + r->alternatives_get_length (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_get_length () + r->alternatives_get_length (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_get_length () + r->alternatives_volta_get_length ();
+  return l.smobbed_copy ();
+}
+
+ADD_MUSIC (Repeated_music);
+
+Repeated_music::Repeated_music ()
+  : Music ()
+{
+}
+
+
+MAKE_SCHEME_CALLBACK (Repeated_music,minimum_start, 1);
+MAKE_SCHEME_CALLBACK (Repeated_music,first_start, 1);
+
+SCM
+Repeated_music::minimum_start (SCM m)
+{
+  Music * me = unsmob_music (m);
+  Music * body = unsmob_music (me->get_property ("element"));
+
+  if (body)
+    return body->start_mom ().smobbed_copy ();
+  else
+    {
+      return Music_sequence::minimum_start (me->get_property ("elements")).smobbed_copy ();
+    }
+}
+
+SCM
+Repeated_music::first_start (SCM m)
+{
+  Music * me = unsmob_music (m);
+  Music * body = unsmob_music (me->get_property ("element"));
+
+  Moment rv =  (body) ? body->start_mom () :
+    Music_sequence::first_start (me->get_property ("elements"));
+
+  return rv.smobbed_copy ();
+}