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 b2873e1e2a990161a9e52e782144814dfd262da8..ee79243e6ea625c88a56b170cf270214d1be390f 100644 (file)
--- a/lily/include/repeated-music.hh
+++ b/lily/include/repeated-music.hh
@@ -1,17 +1,15 @@
-/*   
+/*
   repeated-music.hh -- declare Repeated_music
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#ifndef RepEATED_MUSIC_HH
-#define RepEATED_MUSIC_HH
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#include "music.hh"
+#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,37 +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:
-  Music * body () const;
-  SCM alternatives () const;
+  static Music *body (Music *);
+  static SCM alternatives (Music *);
 
-  /// how often do we repeat?
-  int repeat_count ( ) const;
-  virtual Pitch to_relative_octave (Pitch);
+  /* How often do we repeat? */
+  static int repeat_count (Music *);
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
 
-  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));    
-  
-  /// Transpose, with the interval central C to #p#
-  virtual void transpose (Pitch p);
-
-  /// Scale the music in time by #factor#.
-  virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS (Music);
-  Repeated_music ();
-  Repeated_music (SCM);
+  DECLARE_SCHEME_CALLBACK (first_start, (SCM));
 };
 
-
-#endif /* RepEATED_MUSIC_HH */
+#endif /* REPEATED_MUSIC_HH */