X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=57bf98e73903882c0ed1b651166ecb3c9b519097;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=ee103dbdc60b4c3284ec5a23e4298b9f29ebb0e2;hpb=44d3318feb59f81439c0edc5116ae61fe407c226;p=lilypond.git

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index ee103dbdc6..57bf98e739 100644
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,84 +1,146 @@
-/*   
-  repeated-music.cc --  implement Repeated_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "repeated-music.hh"
-#include "musical-pitch.hh"
+#include "music-sequence.hh"
+#include "pitch.hh"
+#include "warn.hh"
+#include "program-option.hh"
 
-Repeated_music::Repeated_music (Music* r, int n, Music_sequence* a)
+Music *
+Repeated_music::body (Music *me)
 {
-  repeats_i_ = n;
-  unfold_b_ = false;
-  repeat_p_ = r;
-  alternative_p_ = a;
+  return unsmob_music (me->get_property ("element"));
 }
 
-Repeated_music::~Repeated_music ()
+SCM
+Repeated_music::alternatives (Music *me)
 {
-  delete repeat_p_;
-  delete alternative_p_;
+  return me->get_property ("elements");
 }
 
-Repeated_music::Repeated_music (Repeated_music const& s)
-  : Music (s)
+Moment
+Repeated_music::alternatives_get_length (Music *me, bool fold)
 {
-  repeats_i_ = s.repeats_i_;
-  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;
-}
+  SCM alternative_list = alternatives (me);
+  int len = scm_ilength (alternative_list);
+  if (len <= 0)
+    return 0;
 
-void
-Repeated_music::do_print () const
-{
-  if (repeat_p_)
-    repeat_p_->print ();
-  if (alternative_p_)
-    alternative_p_->print ();
+  if (fold)
+    return Music_sequence::maximum_length (alternative_list);
+
+  Moment m = 0;
+  int done = 0;
+  int count = robust_scm2int (me->get_property ("repeat-count"), 0);
+
+  SCM p = alternative_list;
+  while (scm_is_pair (p) && done < count)
+    {
+      m = m + unsmob_music (scm_car (p))->get_length ();
+      done++;
+      if (count - done < len)
+        p = scm_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 (Music *me)
 {
-  if (repeat_p_)
-    repeat_p_->transpose (p);
-  if (alternative_p_)
-    alternative_p_->transpose (p);
+  return Music_sequence::cumulative_length (alternatives (me));
 }
 
+/*
+  Length of the body in THIS. Disregards REPEAT-COUNT.
+*/
 Moment
-Repeated_music::length_mom () const
+Repeated_music::body_get_length (Music *me)
 {
-  Moment m;
-  if (repeat_p_)
-    m += repeat_p_->length_mom ();
-  if (alternative_p_)
-    m += alternative_p_->length_mom ();
+  Moment m = 0;
+  if (Music *body = unsmob_music (me->get_property ("element")))
+    m = body->get_length ();
   return m;
 }
 
+MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1);
+
+SCM
+Repeated_music::unfolded_music_length (SCM m)
+{
+  Music *me = unsmob_music (m);
+
+  Moment l = Moment (repeat_count (me)) * body_get_length (me) + alternatives_get_length (me, false);
+  return l.smobbed_copy ();
+}
+
+MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1);
+SCM
+Repeated_music::folded_music_length (SCM m)
+{
+  Music *me = unsmob_music (m);
+
+  Moment l = body_get_length (me) + alternatives_get_length (me, true);
+  return l.smobbed_copy ();
+}
+
+int
+Repeated_music::repeat_count (Music *me)
+{
+  return scm_to_int (me->get_property ("repeat-count"));
+}
+
+MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1);
+SCM
+Repeated_music::volta_music_length (SCM m)
+{
+  Music *me = unsmob_music (m);
+  Moment l = body_get_length (me) + alternatives_volta_get_length (me);
+  return l.smobbed_copy ();
+}
 
-Musical_pitch
-Repeated_music::to_relative_octave (Musical_pitch p)
+MAKE_SCHEME_CALLBACK (Repeated_music, minimum_start, 1);
+SCM
+Repeated_music::minimum_start (SCM m)
 {
-  p = repeat_p_->to_relative_octave (p);
+  Music *me = unsmob_music (m);
+  Music *body = unsmob_music (me->get_property ("element"));
 
-  p = alternative_p_->do_relative_octave (p, false); 
-  return p;
-  
-  /* ugh.  Should 
-     \relative c'' \repeat 2  { c4 } { < ... > }
+  if (body)
+    return body->start_mom ().smobbed_copy ();
+  else
+    return Music_sequence::minimum_start (me->get_property ("elements")).smobbed_copy ();
+}
+
+MAKE_SCHEME_CALLBACK (Repeated_music, first_start, 1);
+SCM
+Repeated_music::first_start (SCM m)
+{
+  Music *me = unsmob_music (m);
+  Music *body = unsmob_music (me->get_property ("element"));
 
-     and 
-     
-     \relative c'' \repeat 2  { c4 }
-     { { ...} }
+  Moment rv = (body) ? body->start_mom ()
+              : Music_sequence::first_start (me->get_property ("elements"));
 
-     behave differently?
-   */
+  return rv.smobbed_copy ();
 }