release: 1.2.14

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 19a700504cea0608779c8f3b5d6c0e8f49dc26e8..f7cfefac53022388397f8d5d04ab4cfa55d0dfe0 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,5 +1,5 @@
 /*   
-  new-repeated-music.cc --  implement New_repeated_music
+  repeated-music.cc --  implement Repeated_music
   
   source file of the GNU LilyPond music typesetter
   
@@ -7,43 +7,45 @@
   
  */
 
-#include "new-repeated-music.hh"
+#include "repeated-music.hh"
 #include "music-list.hh"
 #include "musical-pitch.hh"
 #include "debug.hh"
 
-New_repeated_music::New_repeated_music(Music *beg, int times, Music_sequence * alts)
+Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts)
 {
   repeat_body_p_ = beg;
   fold_b_ = false;
   repeats_i_ = times;
   alternatives_p_ = alts;
-  semi_fold_b_ = true;
+  volta_fold_b_ = true;
+  if (alts)
+    alts->music_p_list_p_->truncate (times);
 }
 
-New_repeated_music::New_repeated_music (New_repeated_music const &s)
+Repeated_music::Repeated_music (Repeated_music const &s)
   : Music (s)
 {
   repeats_i_ = s.repeats_i_;
   fold_b_ = s.fold_b_;
-  semi_fold_b_ = s.semi_fold_b_;
+  volta_fold_b_ = s.volta_fold_b_;
   
   repeat_body_p_ = s.repeat_body_p_ ? s.repeat_body_p_->clone () : 0;
   alternatives_p_ = s.alternatives_p_
     ? dynamic_cast<Music_sequence*> (s.alternatives_p_->clone ()):0;
 }
 
-New_repeated_music::~New_repeated_music ()
+Repeated_music::~Repeated_music ()
 {
   delete repeat_body_p_;
   delete alternatives_p_;
 }
 
 void
-New_repeated_music::do_print () const
+Repeated_music::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "Fold = " << fold_b_ << " reps: " << repeats_i_;
+  DEBUG_OUT << "Fold = " << fold_b_ << " reps: " << repeats_i_;
 
   if (repeat_body_p_)
     repeat_body_p_->print();
@@ -54,19 +56,20 @@ New_repeated_music::do_print () const
 }
 
 Musical_pitch
-New_repeated_music::to_relative_octave (Musical_pitch p)
+Repeated_music::to_relative_octave (Musical_pitch p)
 {
   if (repeat_body_p_)
     p = repeat_body_p_->to_relative_octave (p);
 
   if (alternatives_p_)
-    p = alternatives_p_->do_relative_octave (p, true);
+    p = alternatives_p_->do_relative_octave (p, false);
   return p;
 }
 
 
+
 void
-New_repeated_music::transpose (Musical_pitch p)
+Repeated_music::transpose (Musical_pitch p)
 {
   if (repeat_body_p_)
     repeat_body_p_->transpose (p);
@@ -76,7 +79,7 @@ New_repeated_music::transpose (Musical_pitch p)
 }
 
 void
-New_repeated_music::compress (Moment p)
+Repeated_music::compress (Moment p)
 {
   if (repeat_body_p_)
     repeat_body_p_->compress (p);
@@ -86,13 +89,13 @@ New_repeated_music::compress (Moment p)
 }
 
 Moment
-New_repeated_music::alternatives_length_mom () const
+Repeated_music::alternatives_length_mom () const
 {
   if (!alternatives_p_ )
     return 0;
   
   if  (fold_b_)
-    alternatives_p_->maximum_length ();
+    return alternatives_p_->maximum_length ();
 
   Moment m =0;
   int done =0;
@@ -101,14 +104,15 @@ New_repeated_music::alternatives_length_mom () const
     {
       m = m + p->car_->length_mom ();
       done ++;
-      if (repeats_i_ - done < alternatives_p_->length_i ())
+      if (volta_fold_b_
+         || repeats_i_ - done < alternatives_p_->length_i ())
        p = p->next_;
     }
   return m;
 }
 
 Moment
-New_repeated_music::length_mom () const
+Repeated_music::length_mom () const
 {
   Moment m =0;
   if (fold_b_)
@@ -119,7 +123,7 @@ New_repeated_music::length_mom () const
   else
     {
       Moment beg = (repeat_body_p_) ? repeat_body_p_->length_mom () : Rational(0);
-      if (!semi_fold_b_)
+      if (!volta_fold_b_)
        beg *=  Rational (repeats_i_);
       m += beg;
     }