release: 1.3.0

[lilypond.git] / lily / unfolded-repeat-iterator.cc

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 99a316406350ae6c5789aaf17b2d86e21617c678..347e929b4afacca896b04f6635ae203154981f6a 100644 (file)
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -8,7 +8,7 @@
  */
 
 
-#include "new-repeated-music.hh"
+#include "repeated-music.hh"
 #include "music-list.hh"
 #include "unfolded-repeat-iterator.hh"
 #include "debug.hh"
@@ -49,7 +49,7 @@ Unfolded_repeat_iterator::next_element ()
     {
       done_mom_ += mus->repeat_body_p_->length_mom ();
 
-      if (!mus->semi_fold_b_)
+      if (!mus->volta_fold_b_)
        done_count_ ++;
      
       if (alternative_cons_l_)
@@ -57,7 +57,7 @@ Unfolded_repeat_iterator::next_element ()
          current_iter_p_ = get_iterator_p (alternative_cons_l_->car_);
          do_main_b_ = false;
        }
-      else if (done_count_ <  mus->repeats_i_ && !mus->semi_fold_b_) 
+      else if (done_count_ <  mus->repeats_i_ && !mus->volta_fold_b_) 
        {
          current_iter_p_ = get_iterator_p (mus->repeat_body_p_);
          do_main_b_ = true;
@@ -73,20 +73,20 @@ Unfolded_repeat_iterator::next_element ()
        {
          done_mom_ += alternative_cons_l_->car_->length_mom ();
 
-         if (mus->semi_fold_b_ || 
+         if (mus->volta_fold_b_ || 
              mus->repeats_i_ - done_count_  < alternative_count_i_)
            alternative_cons_l_ = alternative_cons_l_->next_;
          
          /*
            we've done the main body as well, but didn't go over the other
            increment.  */
-         if (mus->semi_fold_b_)
+         if (mus->volta_fold_b_)
            done_count_ ++;
        }
       
       if (done_count_ < mus->repeats_i_ && alternative_cons_l_)
        {
-         if (mus->semi_fold_b_)
+         if (mus->volta_fold_b_)
            current_iter_p_ = get_iterator_p (alternative_cons_l_->car_);
          else
            {
@@ -142,7 +142,7 @@ Unfolded_repeat_iterator::do_process_and_next (Moment m)
       if (yeah)
        set_translator (yeah->report_to_l ());
       else
-       music_l_->warning ( _("No one to print a volta bracket"));
+       music_l_->warning ( _("no one to print a volta bracket"));
     }
   while (1)
     {
@@ -165,8 +165,8 @@ void
 Unfolded_repeat_iterator::do_print () const
 {
 #ifndef NPRINT
-  DOUT << "count " << done_count_ << "done time " << done_mom_ << '\n';
-  DOUT << "current: ";
+  DEBUG_OUT << "count " << done_count_ << "done time " << Rational (done_mom_) << '\n';
+  DEBUG_OUT << "current: ";
   current_iter_p_->print();
 #endif
 }