release: 1.2.14

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 6436be9bfa7adaea4d34997cece84660e3866b0e..f7cfefac53022388397f8d5d04ab4cfa55d0dfe0 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,5 +1,5 @@
 /*   
-  new-repeated-music.cc --  implement Repeated_music
+  repeated-music.cc --  implement Repeated_music
   
   source file of the GNU LilyPond music typesetter
   
@@ -7,7 +7,7 @@
   
  */
 
-#include "new-repeated-music.hh"
+#include "repeated-music.hh"
 #include "music-list.hh"
 #include "musical-pitch.hh"
 #include "debug.hh"
@@ -18,7 +18,7 @@ Repeated_music::Repeated_music(Music *beg, int times, Music_sequence * alts)
   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);
 }
@@ -28,7 +28,7 @@ Repeated_music::Repeated_music (Repeated_music const &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_
@@ -45,7 +45,7 @@ void
 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();
@@ -62,20 +62,10 @@ Repeated_music::to_relative_octave (Musical_pitch 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;
 }
 
-Music_iterator*
-Repeated_music::to_rhythm (Music_iterator* r)
-{
-  if (repeat_body_p_)
-    r = repeat_body_p_->to_rhythm (r);
-
-  if (alternatives_p_)
-    r = alternatives_p_->do_rhythm (r);
-  return r;
-}
 
 
 void
@@ -105,7 +95,7 @@ Repeated_music::alternatives_length_mom () const
     return 0;
   
   if  (fold_b_)
-    alternatives_p_->maximum_length ();
+    return alternatives_p_->maximum_length ();
 
   Moment m =0;
   int done =0;
@@ -114,7 +104,8 @@ 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;
@@ -132,7 +123,7 @@ 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;
     }