* lily/page.cc (Page): Do not use ly_scheme_function for

[lilypond.git] / lily / include / lyric-combine-music.hh

diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh
index 2be926c64a3116de951e76e80ba45b5f10055a32..566dc9a93f735b75eeb836eb27a9ee89badd55ed 100644 (file)
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -3,25 +3,24 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #ifndef LYRIC_COMBINE_MUSIC_HH
 #define LYRIC_COMBINE_MUSIC_HH
-#include "music.hh"
 
+#include "music.hh"
 
 class Lyric_combine_music : public Music
 {
 public:
-  Music * get_music () const;
-  Music * get_lyrics () const;
-  
   Lyric_combine_music ();
+  VIRTUAL_COPY_CONSTRUCTOR (Music, Lyric_combine_music);
 
-  VIRTUAL_COPY_CONS (Music);
+  Music *get_music () const;
+  Music *get_lyrics () const;
   virtual Moment get_length () const;
 };
-#endif /* LYRIC_COMBINE_MUSIC_HH */
 
+#endif /* LYRIC_COMBINE_MUSIC_HH */