X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frepeated-music.hh;h=b222111fe4368b3dbc5712c2b1743505551428d0;hb=8da6cef580cce3365b219f6aca429b434cb60fcf;hp=beca7dc1d053728839767e5f269b180d684069c0;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git

diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh
index beca7dc1d0..b222111fe4 100644
--- a/lily/include/repeated-music.hh
+++ b/lily/include/repeated-music.hh
@@ -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.
 
@@ -52,21 +51,18 @@ class Repeated_music : public Music
 public:
   Music * body () const;
   Music_sequence * alternatives () const;
-  String type_;
-  
-  bool fold_b_;
-  /// if FOLD_B_ is false, semifold this.
-  bool volta_fold_b_;
 
   /// how often do we repeat?
-  int repeats_i_;
+  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 () const;
+  Moment alternatives_length_mom (bool fold) 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);