X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flyric-combine-music.hh;h=100f03e723a919613690379698f07488ad633a5f;hb=b4ba6444fc75af979d4c3e40a9e8db7fcd138ae9;hp=a2fcd65daec0f612d7865e01e90dad93b4c87bb4;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh
index a2fcd65dae..100f03e723 100644
--- a/lily/include/lyric-combine-music.hh
+++ b/lily/include/lyric-combine-music.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -15,14 +15,14 @@
 class Lyric_combine_music : public Music
 {
 public:
-  Music * music_l () const;
-  Music * lyrics_l () const;
+  Music * get_music () const;
+  Music * get_lyrics () const;
   
-  Lyric_combine_music (SCM);
+  Lyric_combine_music ();
   virtual void transpose (Pitch);
 
-  VIRTUAL_COPY_CONS(Music);
-  virtual Moment length_mom () const;
+  VIRTUAL_COPY_CONS (Music);
+  virtual Moment get_length () const;
   virtual Pitch to_relative_octave (Pitch);
   virtual void compress (Moment);
 };