Run `make grand-replace'.

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

diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc
index e5ccef6c0c5e6667f7569136028968485e36d1e2..becbbfcb5b55f6c45cf0200234fd4fcaa49d8899 100644 (file)
--- a/lily/repeated-music.cc
+++ b/lily/repeated-music.cc
@@ -1,17 +1,16 @@
-/*   
+/*
   repeated-music.cc -- implement Repeated_music
-  
+
   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)
@@ -25,22 +24,22 @@ Repeated_music::alternatives (Music *me)
   return me->get_property ("elements");
 }
 
-MAKE_SCHEME_CALLBACK(Repeated_music, relative_callback, 2);
+MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2);
 SCM
 Repeated_music::relative_callback (SCM music, SCM pitch)
 {
   Pitch p = *unsmob_pitch (pitch);
-  Music *me = unsmob_music (music); 
+  Music *me = unsmob_music (music);
   if (lily_1_8_relative)
     {
       Music *body = unsmob_music (me->get_property ("element"));
       if (body)
        p = body->to_relative_octave (p);
 
-      Pitch last = p ;
+      Pitch last = p;
       SCM alternatives = me->get_property ("elements");
 
-      for (SCM s = alternatives; scm_is_pair (s);  s = scm_cdr (s))
+      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);
@@ -49,20 +48,17 @@ 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
-Repeated_music::alternatives_get_length (Music *me, bool fold) 
+Repeated_music::alternatives_get_length (Music *me, bool fold)
 {
   SCM alternative_list = alternatives (me);
   int len = scm_ilength (alternative_list);
   if (len <= 0)
     return 0;
-  
+
   if (fold)
     return Music_sequence::maximum_length (alternative_list);
 
@@ -74,7 +70,7 @@ Repeated_music::alternatives_get_length (Music *me, bool fold)
   while (scm_is_pair (p) && done < count)
     {
       m = m + unsmob_music (scm_car (p))->get_length ();
-      done ++;
+      done++;
       if (count - done < len)
        p = scm_cdr (p);
     }
@@ -91,22 +87,18 @@ Repeated_music::alternatives_volta_get_length (Music *me)
   return Music_sequence::cumulative_length (alternatives (me));
 }
 
-
 /*
-  Length of the body in THIS. Disregards REPEAT-COUNT. 
- */
+  Length of the body in THIS. Disregards REPEAT-COUNT.
+*/
 Moment
 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;
 }
 
-
 MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1);
 
 SCM
@@ -124,12 +116,12 @@ Repeated_music::folded_music_length (SCM m)
 {
   Music *me = unsmob_music (m);
 
-  Moment l =  body_get_length (me) + alternatives_get_length (me, true);
+  Moment l = body_get_length (me) + alternatives_get_length (me, true);
   return l.smobbed_copy ();
 }
 
 int
-Repeated_music::repeat_count (Music *me) 
+Repeated_music::repeat_count (Music *me)
 {
   return scm_to_int (me->get_property ("repeat-count"));
 }
@@ -153,20 +145,18 @@ 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);
 SCM
 Repeated_music::first_start (SCM m)
 {
-  Music * me = unsmob_music (m);
-  Music * body = unsmob_music (me->get_property ("element"));
+  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 ();
 }