* Documentation/user/refman.itely: remove superfluous -'s

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

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index d6e42d2cbced0d83353e119fbf25710115e6ffce..1d0b911515affdfea683c97b6cb50096b281029c 100644 (file)
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -3,61 +3,45 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "lyric-combine-music.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
+Lyric_combine_music::Lyric_combine_music ()
+  : Music ()
 {
-  set_mus_property ("music", m->self_scm_);
-  set_mus_property ("lyrics", l->self_scm_);  
-}
-
-
-void
-Lyric_combine_music::transpose (Musical_pitch p)
-{
-  music_l ()->transpose (p);
-  lyrics_l () ->transpose (p);
-}
-
-void
-Lyric_combine_music::do_print () const  
-{
-  music_l ()->print();
-  lyrics_l () ->print ();
 }
 
 Moment
-Lyric_combine_music::length_mom () const
+Lyric_combine_music::get_length () const
 {
-  return music_l ()->length_mom ();
+  return get_music ()->get_length ();
 }
 
-Musical_pitch
-Lyric_combine_music::to_relative_octave (  Musical_pitch p )
+Music*
+Lyric_combine_music::get_music () const
 {
-  p = music_l ()->to_relative_octave (p);
-  return lyrics_l () ->to_relative_octave (p);
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
-void
-Lyric_combine_music::compress (Moment m)
-{
-  music_l ()->compress (m);
-}
 
 Music*
-Lyric_combine_music::music_l () const
+Lyric_combine_music::get_lyrics () const
 {
-  return unsmob_music (get_mus_property ("music"));
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  l = gh_cdr (l);
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
-Music*
-Lyric_combine_music::lyrics_l () const
-{
-  return unsmob_music (get_mus_property ("lyrics"));
-}
+
+ADD_MUSIC (Lyric_combine_music);