* scm/define-context-properties.scm:

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

diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc
index 3963c5dd4b719b9407cd4854eb103d93a53be04f..b927653e0c1dfa02fed41e1a9fedfb0f6b6df287 100644 (file)
--- a/lily/folded-repeat-iterator.cc
+++ b/lily/folded-repeat-iterator.cc
@@ -3,15 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "folded-repeat-iterator.hh"
 
+#include "context.hh"
 #include "input.hh"
+#include "international.hh"
 #include "repeated-music.hh"
 #include "simultaneous-music-iterator.hh"
-#include "context.hh"
 
 Folded_repeat_iterator::Folded_repeat_iterator ()
 {
@@ -35,9 +36,7 @@ Moment
 Folded_repeat_iterator::pending_moment () const
 {
   if (main_iter_)
-    {
-      return main_iter_->pending_moment ();
-    }
+    return main_iter_->pending_moment ();
   else
     return main_length_mom_ + alternative_iter_->pending_moment ();
 }
@@ -72,9 +71,7 @@ Folded_repeat_iterator::process (Moment m)
     }
 
   if (!main_iter_ && !alternative_iter_)
-    {
-      enter_alternative ();
-    }
+    enter_alternative ();
 
   if (alternative_iter_)
     {
@@ -113,7 +110,7 @@ Folded_repeat_iterator::enter_alternative ()
       alternative_iter_ = s;
       alternative_iter_->construct_children ();
 
-      scm_gc_unprotect_object (s->self_scm ());
+      s->unprotect ();
     }
 }
 
@@ -121,9 +118,7 @@ Music_iterator *
 Folded_repeat_iterator::try_music_in_children (Music *m) const
 {
   if (main_iter_)
-    {
-      return main_iter_->try_music (m);
-    }
+    return main_iter_->try_music (m);
   if (alternative_iter_)
     return alternative_iter_->try_music (m);
   return 0;