Run `make grand-replace'.

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 4a0f7d6e88a8dbc6ac7d34140cbcf5ba3196daad..becbbfcb5b55f6c45cf0200234fd4fcaa49d8899 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "repeated-music.hh"
 #include "music-sequence.hh"
 #include "pitch.hh"
 #include "warn.hh"
-#include "scm-option.hh"
+#include "program-option.hh"
 
 Music *
 Repeated_music::body (Music *me)
@@ -48,9 +48,7 @@ Repeated_music::relative_callback (SCM music, SCM pitch)
       return last.smobbed_copy ();
     }
   else
-    {
-      return me->generic_to_relative_octave (p).smobbed_copy ();
-    }
+    return me->generic_to_relative_octave (p).smobbed_copy ();
 }
 
 Moment
@@ -97,9 +95,7 @@ Repeated_music::body_get_length (Music *me)
 {
   Moment m = 0;
   if (Music *body = unsmob_music (me->get_property ("element")))
-    {
-      m = body->get_length ();
-    }
+    m = body->get_length ();
   return m;
 }
 
@@ -149,9 +145,7 @@ Repeated_music::minimum_start (SCM m)
   if (body)
     return body->start_mom ().smobbed_copy ();
   else
-    {
-      return Music_sequence::minimum_start (me->get_property ("elements")).smobbed_copy ();
-    }
+    return Music_sequence::minimum_start (me->get_property ("elements")).smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Repeated_music, first_start, 1);
@@ -161,8 +155,8 @@ Repeated_music::first_start (SCM m)
   Music *me = unsmob_music (m);
   Music *body = unsmob_music (me->get_property ("element"));
 
-  Moment rv = (body) ? body->start_mom () :
-    Music_sequence::first_start (me->get_property ("elements"));
+  Moment rv = (body) ? body->start_mom ()
+    : Music_sequence::first_start (me->get_property ("elements"));
 
   return rv.smobbed_copy ();
 }