X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-list.hh;h=c77cccd70f25f77237b5f9a6e86015d2de80d4a1;hb=947454c5cc430a9627262de4f25274a64789d3c2;hp=1d74ba0438dc40230efe45075da409116419c3e0;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 1d74ba0438..c77cccd70f 100644
--- 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--2003 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,24 +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 get_length () const;
   virtual Moment start_mom () const;
-  Simultaneous_music ();
 };
 
-/**
-  The event is a collection of Events. A note that you enter in lilypond is 
-  one Event_chord, one syllable of lyrics is one Event_chord
+/*
+  A chord.
  */
 class Event_chord : public Simultaneous_music
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
-  virtual Moment start_mom () const;
-
-  Event_chord ();
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Event_chord);
+  virtual Pitch to_relative_octave (Pitch);
 };
 
 /**
@@ -45,11 +42,11 @@ public:
 class Sequential_music : public Music_sequence
 {
 public:
-  VIRTUAL_COPY_CONS (Music);
+  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 */