Run `make grand-replace'.

[lilypond.git] / lily / include / repeated-music.hh

diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh
index 7d8141dc4fc702e8d772cb74280f108b017bdac4..ee79243e6ea625c88a56b170cf270214d1be390f 100644 (file)
--- a/lily/include/repeated-music.hh
+++ b/lily/include/repeated-music.hh
@@ -1,18 +1,16 @@
-/*   
+/*
   repeated-music.hh -- declare Repeated_music
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef REPEATED_MUSIC_HH
 #define REPEATED_MUSIC_HH
 
 #include "music.hh"
 
-
 /**
    Musical repeats.
 
@@ -25,12 +23,12 @@
    There are three modes of representing this  music:
 
    BODY A
-        B
-       C
+   B
+   C
 
    is called "folded". Mostly used for lyrics.
 
-   
+
    BODY A B C
 
    is called volta.  This is common notation
@@ -44,33 +42,26 @@
 
    If the number of repeats is bigger than the number of alternatives, then
    the first alternative is assumed to be repeated.
-   
 */
-class Repeated_music : public Music
+class Repeated_music
 {
 public:
-  Repeated_music (SCM);
-  VIRTUAL_COPY_CONSTRUCTOR (Music, Repeated_music);
-
-  Music *body () const;
-  SCM alternatives () const;
+  static Music *body (Music *);
+  static SCM alternatives (Music *);
 
   /* How often do we repeat? */
-  int repeat_count () const;
-  DECLARE_SCHEME_CALLBACK(relative_callback,(SCM,SCM));
+  static int repeat_count (Music *);
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
 
-  virtual Pitch to_relative_octave (Pitch);
-
-  Moment body_get_length () const;
-  Moment alternatives_get_length (bool fold) const;
-  Moment alternatives_volta_get_length () const;  
+  static Moment body_get_length (Music *);
+  static Moment alternatives_get_length (Music *, bool fold);
+  static Moment alternatives_volta_get_length (Music *);
 
   DECLARE_SCHEME_CALLBACK (unfolded_music_length, (SCM));
   DECLARE_SCHEME_CALLBACK (volta_music_length, (SCM));
-  DECLARE_SCHEME_CALLBACK (folded_music_length, (SCM));    
+  DECLARE_SCHEME_CALLBACK (folded_music_length, (SCM));
   DECLARE_SCHEME_CALLBACK (minimum_start, (SCM));
-  DECLARE_SCHEME_CALLBACK (first_start, (SCM));    
+  DECLARE_SCHEME_CALLBACK (first_start, (SCM));
 };
 
-
 #endif /* REPEATED_MUSIC_HH */