changes 2.3.x to 2.5.x.

[lilypond.git] / lily / lyric-combine-music.cc

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index cb77d13c1eafc71ae6f9f694c9c78025dff3a66e..021c915953faff9a7be9e3ba969871d8c1ad7220 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -15,56 +15,32 @@ Lyric_combine_music::Lyric_combine_music ()
 {
 }
 
-
-void
-Lyric_combine_music::transpose (Pitch p)
-{
-  get_music ()->transpose (p);
-  get_lyrics () ->transpose (p);
-}
-
-
 Moment
 Lyric_combine_music::get_length () const
 {
   return get_music ()->get_length ();
 }
 
-Pitch
-Lyric_combine_music::to_relative_octave (Pitch p)
-{
-  p = get_music ()->to_relative_octave (p);
-  return get_lyrics () ->to_relative_octave (p);
-}
-
-void
-Lyric_combine_music::compress (Moment m)
-{
-  get_music ()->compress (m);
-}
-
-
-
 Music*
 Lyric_combine_music::get_music () const
 {
-  SCM l = get_mus_property ("elements");
-  if (!gh_pair_p (l))
+  SCM l = get_property ("elements");
+  if (!scm_is_pair (l))
     return 0;
-  return unsmob_music (gh_car (l));
+  return unsmob_music (scm_car (l));
 }
 
 
 Music*
 Lyric_combine_music::get_lyrics () const
 {
-  SCM l = get_mus_property ("elements");
-  if (!gh_pair_p (l))
+  SCM l = get_property ("elements");
+  if (!scm_is_pair (l))
     return 0;
-  l = gh_cdr (l);
-  if (!gh_pair_p (l))
+  l = scm_cdr (l);
+  if (!scm_is_pair (l))
     return 0;
-  return unsmob_music (gh_car (l));
+  return unsmob_music (scm_car (l));
 }