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 3ab20f6d33af597aef3f625f2c25915e45cffdbb..021c915953faff9a7be9e3ba969871d8c1ad7220 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -3,76 +3,45 @@
   
   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>
   
  */
 
 #include "lyric-combine-music.hh"
-#include "lyric-combine-music-iterator.hh"
 #include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music (SCM l)
-  : Music (l)
-{
-  set_mus_property ("iterator-ctor",
-                   Lyric_combine_music_iterator::constructor_cxx_function);
-}
-
-
-void
-Lyric_combine_music::transpose (Pitch p)
+Lyric_combine_music::Lyric_combine_music ()
+  : Music ()
 {
-  music_l ()->transpose (p);
-  lyrics_l () ->transpose (p);
 }
 
-
 Moment
-Lyric_combine_music::length_mom () const
-{
-  return music_l ()->length_mom ();
-}
-
-Pitch
-Lyric_combine_music::to_relative_octave (Pitch p)
+Lyric_combine_music::get_length () const
 {
-  p = music_l ()->to_relative_octave (p);
-  return lyrics_l () ->to_relative_octave (p);
+  return get_music ()->get_length ();
 }
 
-void
-Lyric_combine_music::compress (Moment m)
-{
-  music_l ()->compress (m);
-}
-
-
-
 Music*
-Lyric_combine_music::music_l () const
+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::lyrics_l () const
+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));
 }
 
-Lyric_combine_music::Lyric_combine_music ()
-  : Music (SCM_EOL)
-{
-}
 
 ADD_MUSIC (Lyric_combine_music);