Imported Upstream version 2.16.0

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

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index b7ac2059f14964e33260d4f28d6d1b1499d9c251..2e386e6fd18bba885a63cd6e3c1426fe29db2e29 100644 (file)
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2012 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
@@ -50,7 +50,7 @@ SCM
 Volta_repeat_iterator::get_music_list ()const
 {
   return scm_cons (get_music ()->get_property ("element"),
-                  get_music ()->get_property ("elements"));
+                   Sequential_iterator::get_music_list ());
 }
 
 void
@@ -60,7 +60,7 @@ Volta_repeat_iterator::construct_children ()
 
   SCM alts = get_music ()->get_property ("elements");
 
-  alt_count_ = scm_ilength (alts);
+  alt_count_ = int (scm_ilength (alts));
   rep_count_ = scm_to_int (get_music ()->get_property ("repeat-count"));
   done_count_ = 0;
 }
@@ -76,7 +76,7 @@ Volta_repeat_iterator::add_repeat_command (SCM what)
   Context *where = get_outlet ()->where_defined (reps, &current_reps);
 
   if (where
-       && (current_reps == SCM_EOL || scm_is_pair (current_reps)))
+      && (current_reps == SCM_EOL || scm_is_pair (current_reps)))
     {
       current_reps = scm_cons (what, current_reps);
       where->set_property (reps, current_reps);
@@ -93,25 +93,25 @@ Volta_repeat_iterator::next_element (bool side_effect)
   if (side_effect)
     {
       if (alt_count_)
-       {
-         string repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
-         if (done_count_ > 1)
-           {
-             add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
-
-             if (done_count_ - 1 < alt_count_)
-               add_repeat_command (ly_symbol2scm ("end-repeat"));
-           }
-
-         if (done_count_ == 1 && alt_count_ < rep_count_)
-           repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
-
-         if (done_count_ <= alt_count_)
-           add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
-                                           ly_string2scm (repstr), SCM_UNDEFINED));
-       }
+        {
+          string repstr = to_string (rep_count_ - alt_count_ + done_count_) + ".";
+          if (done_count_ > 1)
+            {
+              add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
+
+              if (done_count_ - 1 < alt_count_)
+                add_repeat_command (ly_symbol2scm ("end-repeat"));
+            }
+
+          if (done_count_ == 1 && alt_count_ < rep_count_)
+            repstr = "1.--" + to_string (rep_count_ - alt_count_ + done_count_) + ".";
+
+          if (done_count_ <= alt_count_)
+            add_repeat_command (scm_list_n (ly_symbol2scm ("volta"),
+                                            ly_string2scm (repstr), SCM_UNDEFINED));
+        }
       else
-       add_repeat_command (ly_symbol2scm ("end-repeat"));
+        add_repeat_command (ly_symbol2scm ("end-repeat"));
     }
 }