X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=2560391a08c8ce07ebb210f76402ff4913f92e9f;hb=2aeac5e3815effa47427dad86d6be811c7b0d8a2;hp=0081363e7f2a329536c879312b7c17f8f425c4cb;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index 0081363e7f..2560391a08 100644
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,16 +1,27 @@
 /*
-  repeated-music.cc -- implement Repeated_music
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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)
@@ -34,23 +45,21 @@ Repeated_music::relative_callback (SCM music, SCM pitch)
     {
       Music *body = unsmob_music (me->get_property ("element"));
       if (body)
-	p = body->to_relative_octave (p);
+        p = body->to_relative_octave (p);
 
       Pitch last = p;
       SCM alternatives = me->get_property ("elements");
 
       for (SCM s = alternatives; scm_is_pair (s); s = scm_cdr (s))
-	{
-	  lily_1_8_compatibility_used = true;
-	  unsmob_music (scm_car (s))->to_relative_octave (p);
-	}
+        {
+          lily_1_8_compatibility_used = true;
+          unsmob_music (scm_car (s))->to_relative_octave (p);
+        }
 
       return last.smobbed_copy ();
     }
   else
-    {
-      return me->generic_to_relative_octave (p).smobbed_copy ();
-    }
+    return me->generic_to_relative_octave (p).smobbed_copy ();
 }
 
 Moment
@@ -74,7 +83,7 @@ Repeated_music::alternatives_get_length (Music *me, bool fold)
       m = m + unsmob_music (scm_car (p))->get_length ();
       done++;
       if (count - done < len)
-	p = scm_cdr (p);
+        p = scm_cdr (p);
     }
   return m;
 }
@@ -97,9 +106,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 +156,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);
@@ -162,7 +167,7 @@ Repeated_music::first_start (SCM m)
   Music *body = unsmob_music (me->get_property ("element"));
 
   Moment rv = (body) ? body->start_mom ()
-    : Music_sequence::first_start (me->get_property ("elements"));
+              : Music_sequence::first_start (me->get_property ("elements"));
 
   return rv.smobbed_copy ();
 }