release: 1.2.14

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 57b1b2bf88e8a13cff6b3377e8fc8ebac5d6ed5f..f7cfefac53022388397f8d5d04ab4cfa55d0dfe0 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -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,7 +62,7 @@ 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;
 }
 
@@ -104,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;