release: 1.3.107

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

diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh
index 25b2bee652a1e4d7db462b9f5b326e32e91b0fe8..b222111fe4368b3dbc5712c2b1743505551428d0 100644 (file)
--- a/lily/include/repeated-music.hh
+++ b/lily/include/repeated-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -33,13 +33,12 @@
    
    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.
 
@@ -50,24 +49,20 @@
 class Repeated_music : public Music
 {
 public:
-  bool fold_b_;
-  /// if FOLD_B_ is false, semifold this.
-  bool volta_fold_b_;
+  Music * body () const;
+  Music_sequence * alternatives () const;
 
   /// how often do we repeat?
-  int repeats_i_;
-
-  Music * repeat_body_p_;
-  Music_sequence * alternatives_p_;
-
+  int repeat_count( ) const;
   virtual Musical_pitch to_relative_octave (Musical_pitch);
 
-  /// The duration of this piece of music
-  virtual Moment length_mom () const;
+  Moment body_length_mom () const;
+  Moment alternatives_length_mom (bool fold) const;
 
-  Moment alternatives_length_mom () const;
-
-  void print() const;
+  DECLARE_SCHEME_CALLBACK(unfolded_music_length, (SCM));
+  DECLARE_SCHEME_CALLBACK(volta_music_length, (SCM));
+  DECLARE_SCHEME_CALLBACK(folded_music_length, (SCM));    
+  
   /// Transpose, with the interval central C to #p#
   virtual void transpose (Musical_pitch p);
 
@@ -77,9 +72,6 @@ public:
 
   Repeated_music (Music*, int , Music_sequence*);
   Repeated_music (Repeated_music const&);
-  ~Repeated_music ();
-protected:
-  virtual void do_print() const;
 };