X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffolded-repeat-iterator.cc;h=16456ed41f48dd234d61d83a1ddcfba3bfd0c2ca;hb=9ca26f1645ce2e09fcf66a45f0aa2f54ca4be497;hp=4767976066d4a843f3e294dbf3b5bbb202430e19;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git

diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index 4767976066..16456ed41f 100644
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -7,8 +7,9 @@
   
  */
 
-#include "input.hh"
 #include "folded-repeat-iterator.hh"
+
+#include "input.hh"
 #include "repeated-music.hh"
 #include "music-list.hh"
 #include "simultaneous-music-iterator.hh"
@@ -26,10 +27,10 @@ Folded_repeat_iterator::ok () const
   return main_iter_ || alternative_iter_;
 }
 void
-Folded_repeat_iterator::do_quit()
+Folded_repeat_iterator::do_quit ()
 {
-  if (main_iter_)main_iter_->quit();
-  if (alternative_iter_)alternative_iter_->quit();
+  if (main_iter_)main_iter_->quit ();
+  if (alternative_iter_)alternative_iter_->quit ();
 }
 
 Moment
@@ -82,8 +83,8 @@ Folded_repeat_iterator::process (Moment m)
       alternative_iter_->process (m - main_length_mom_);
       if (!alternative_iter_->ok ())
 	{
-	  alternative_iter_->quit();
-	  alternative_iter_ =0;
+	  alternative_iter_->quit ();
+	  alternative_iter_ = 0;
 	}
     }
 }
@@ -108,13 +109,13 @@ Folded_repeat_iterator::enter_alternative ()
 	ugh.
       */ 
       Simultaneous_music_iterator * s = new Simultaneous_music_iterator;
-      s->separate_contexts_b_ = true;
+      s->create_separate_contexts_ = true;
       s->init_translator (mus, get_outlet ());
       
       alternative_iter_ = s;
       alternative_iter_->construct_children ();
 
-      scm_gc_unprotect_object (s->self_scm());
+      scm_gc_unprotect_object (s->self_scm ());
     }
 }
 
@@ -131,12 +132,12 @@ Folded_repeat_iterator::try_music_in_children (Music * m) const
   return 0;
 }
 void
-Folded_repeat_iterator::derived_mark()const
+Folded_repeat_iterator::derived_mark ()const
 {
   if (main_iter_)
-    scm_gc_mark (main_iter_->self_scm());
+    scm_gc_mark (main_iter_->self_scm ());
   if (alternative_iter_)
-    scm_gc_mark (alternative_iter_->self_scm());
+    scm_gc_mark (alternative_iter_->self_scm ());
 }
 
 void