*** empty log message ***

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

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 1dcaaeb818517a4923b7eb10f685695349017f3f..c77cccd70f25f77237b5f9a6e86015d2de80d4a1 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -1,15 +1,14 @@
 /*
-  music-list.hh -- declare Music_sequence,
-  Simultaneous_music and Sequential_music
+  music-list.hh -- declare Simultaneous_music, Sequential_music, Event_chord
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#ifndef Music_sequence_HH
-#define Music_sequence_HH
+#ifndef MUSIC_LIST_HH
+#define MUSIC_LIST_HH
 
 #include "music-sequence.hh"
 
@@ -19,25 +18,22 @@
 class Simultaneous_music : public Music_sequence
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
+  Simultaneous_music ();
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Simultaneous_music);
+
   virtual Pitch to_relative_octave (Pitch);
-  virtual Moment length_mom () const;
+  virtual Moment get_length () const;
   virtual Moment start_mom () const;
-  Simultaneous_music ();
 };
 
-/**
-  The request is a collection of Requests. A note that you enter in lilypond is 
-  one Request_chord, one syllable of lyrics is one Request_chord
+/*
+  A chord.
  */
-class Request_chord : public Simultaneous_music
+class Event_chord : public Simultaneous_music
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Event_chord);
   virtual Pitch to_relative_octave (Pitch);
-  virtual Moment start_mom () const;
-
-  Request_chord ();
 };
 
 /**
@@ -46,11 +42,11 @@ public:
 class Sequential_music : public Music_sequence
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
-  virtual Moment length_mom () const;
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Sequential_music);
+  virtual Moment get_length () const;
   virtual Moment start_mom () const;
   
   Sequential_music ();
 };
 
-#endif // Music_sequence_HH
+#endif /* MUSIC_LIST_HH */