*** empty log message ***

[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 9b121ff0d7816c5e026f7a8048bf9664a75f6a77..100f03e723a919613690379698f07488ad633a5f 100644 (file)
--- 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -15,15 +15,15 @@
 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 (Music*, Music*);
-  virtual void transpose (Musical_pitch);
+  Lyric_combine_music ();
+  virtual void transpose (Pitch);
 
-  VIRTUAL_COPY_CONS(Music);
-  virtual Moment length_mom () const;
-  virtual Musical_pitch to_relative_octave (Musical_pitch);
+  VIRTUAL_COPY_CONS (Music);
+  virtual Moment get_length () const;
+  virtual Pitch to_relative_octave (Pitch);
   virtual void compress (Moment);
 };
 #endif /* LYRIC_COMBINE_MUSIC_HH */