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 25b2bee652a1e4d7db462b9f5b326e32e91b0fe8..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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#ifndef RepEATED_MUSIC_HH
-#define RepEATED_MUSIC_HH
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#ifndef REPEATED_MUSIC_HH
+#define REPEATED_MUSIC_HH
 
 #include "music.hh"
 
-
 /**
    Musical repeats.
 
@@ -25,62 +23,45 @@
    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 "semi" folded.  This is common notation
+   is called volta.  This is common notation
 
    BODY A BODY B BODY C
 
    is called unfolded.  Useful for MIDI.
 
-
    If the number of repeats is smaller than the number of alternatives, then
    the excess alternatives are ignored for all timing purposes.
 
    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:
-  bool fold_b_;
-  /// if FOLD_B_ is false, semifold this.
-  bool volta_fold_b_;
-
-  /// how often do we repeat?
-  int repeats_i_;
-
-  Music * repeat_body_p_;
-  Music_sequence * alternatives_p_;
-
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
-
-  /// The duration of this piece of music
-  virtual Moment length_mom () const;
-
-  Moment alternatives_length_mom () const;
-
-  void print() const;
-  /// Transpose, with the interval central C to #p#
-  virtual void transpose (Musical_pitch p);
-
-  /// Scale the music in time by #factor#.
-  virtual void compress (Moment factor);
-  VIRTUAL_COPY_CONS(Music);
-
-  Repeated_music (Music*, int , Music_sequence*);
-  Repeated_music (Repeated_music const&);
-  ~Repeated_music ();
-protected:
-  virtual void do_print() const;
+  static Music *body (Music *);
+  static SCM alternatives (Music *);
+
+  /* How often do we repeat? */
+  static int repeat_count (Music *);
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+
+  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 (minimum_start, (SCM));
+  DECLARE_SCHEME_CALLBACK (first_start, (SCM));
 };
 
-
-#endif /* RepEATED_MUSIC_HH */
+#endif /* REPEATED_MUSIC_HH */