patch::: 1.3.82.hwn1

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index e34a5c8da64606079c1aaa11d0cc74bb02f670e4..f817ab0d3332d1f41871fa87b02af96c68c91d6d 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,81 +3,142 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "repeated-music.hh"
+#include "music-list.hh"
 #include "musical-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 ("body"));
 }
 
-Repeated_music::~Repeated_music ()
+Music_sequence*
+Repeated_music::alternatives ()const
 {
-  delete repeat_p_;
-  delete alternative_p_;
+  return dynamic_cast<Music_sequence*>  (unsmob_music (get_mus_property ("alternatives")));
 }
 
-Repeated_music::Repeated_music (Repeated_music const& s)
+Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts)
+{
+  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 ());
+    }
+
+  scm_unprotect_object (beg->self_scm ());
+  scm_unprotect_object (alts->self_scm ());  
+}
+
+Repeated_music::Repeated_music (Repeated_music const &s)
   : Music (s)
 {
-  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;
+  repeats_i_ = s.repeats_i_;
+  fold_b_ = s.fold_b_;
+  volta_fold_b_ = s.volta_fold_b_;
+  type_ = s.type_;
 }
 
+
 void
 Repeated_music::do_print () const
 {
-  if (repeat_p_)
-    repeat_p_->print ();
-  if (alternative_p_)
-    alternative_p_->print ();
+#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)
+{
+  if (body ())
+    p = body ()->to_relative_octave (p);
+
+  Musical_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);
+     
+
+  return last;
 }
 
 void
 Repeated_music::transpose (Musical_pitch p)
 {
-  if (repeat_p_)
-    repeat_p_->transpose (p);
-  if (alternative_p_)
-    alternative_p_->transpose (p);
+  if (body ())
+    body ()->transpose (p);
+
+  if (alternatives ())
+    alternatives ()->transpose (p);  
 }
 
-Moment
-Repeated_music::length_mom () const
+void
+Repeated_music::compress (Moment p)
 {
-  Moment m;
-  if (repeat_p_)
-    m += repeat_p_->length_mom ();
-  if (alternative_p_)
-    m += alternative_p_->length_mom ();
-  return m;
-}
+  if (body ())
+    body ()->compress (p);
 
+  if (alternatives ())
+    alternatives ()->compress (p);  
+}
 
-Musical_pitch
-Repeated_music::to_relative_octave (Musical_pitch p)
+Moment
+Repeated_music::alternatives_length_mom () const
 {
-  p = repeat_p_->to_relative_octave (p);
-
-  p = alternative_p_->do_relative_octave (p, false); 
-  return p;
+  if (!alternatives () )
+    return 0;
   
-  /* ugh.  Should 
-     \relative c'' \repeat 2  { c4 } { < ... > }
+  if  (fold_b_)
+    return alternatives ()->maximum_length ();
 
-     and 
-     
-     \relative c'' \repeat 2  { c4 }
-     { { ...} }
+  Moment m =0;
+  int done =0;
 
-     behave differently?
-   */
+  SCM p = alternatives ()->music_list ();
+   while (gh_pair_p (p) && done < repeats_i_)
+    {
+      m = m + unsmob_music (gh_car (p))->length_mom ();
+      done ++;
+      if (volta_fold_b_
+         || repeats_i_ - done < alternatives ()->length_i ())
+      p = gh_cdr (p);
+    }
+  return m;
 }
+
+Moment
+Repeated_music::body_length_mom () const
+{
+  Moment m = 0;
+  if (body ())
+    {
+      m = body ()->length_mom ();
+      if (!fold_b_ && !volta_fold_b_)
+       m *= Rational (repeats_i_);
+    }
+  return m;
+}
+
+Moment
+Repeated_music::length_mom () const
+{
+  return body_length_mom () + alternatives_length_mom ();
+}
+