* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index a91dcb5644d5c9a0116d29eaf6fe6ba939edc929..8e36faa6747190296c2ac9da5ed56b639fd40e76 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,51 +11,68 @@
 #include "lyric-combine-music-iterator.hh"
 #include "pitch.hh"
 
-Lyric_combine_music::Lyric_combine_music (Music * m, Music * l)
+Lyric_combine_music::Lyric_combine_music (SCM l)
+  : Music (l)
 {
-  set_mus_property ("music", m->self_scm ());
-  set_mus_property ("lyrics", l->self_scm ());  
-
   set_mus_property ("iterator-ctor",
-                   Lyric_combine_music_iterator::constructor_cxx_function);
+                   Lyric_combine_music_iterator::constructor_proc);
 }
 
 
 void
 Lyric_combine_music::transpose (Pitch p)
 {
-  music_l ()->transpose (p);
-  lyrics_l () ->transpose (p);
+  get_music ()->transpose (p);
+  get_lyrics () ->transpose (p);
 }
 
 
 Moment
 Lyric_combine_music::length_mom () const
 {
-  return music_l ()->length_mom ();
+  return get_music ()->length_mom ();
 }
 
 Pitch
-Lyric_combine_music::to_relative_octave (  Pitch p )
+Lyric_combine_music::to_relative_octave (Pitch p)
 {
-  p = music_l ()->to_relative_octave (p);
-  return lyrics_l () ->to_relative_octave (p);
+  p = get_music ()->to_relative_octave (p);
+  return get_lyrics () ->to_relative_octave (p);
 }
 
 void
 Lyric_combine_music::compress (Moment m)
 {
-  music_l ()->compress (m);
+  get_music ()->compress (m);
 }
 
+
+
 Music*
-Lyric_combine_music::music_l () const
+Lyric_combine_music::get_music () const
 {
-  return unsmob_music (get_mus_property ("music"));
+  SCM l = get_mus_property ("elements");
+  if (!gh_pair_p (l))
+    return 0;
+  return unsmob_music (gh_car (l));
 }
 
+
 Music*
-Lyric_combine_music::lyrics_l () const
+Lyric_combine_music::get_lyrics () const
 {
-  return unsmob_music (get_mus_property ("lyrics"));
+  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));
 }
+
+Lyric_combine_music::Lyric_combine_music ()
+  : Music (SCM_EOL)
+{
+}
+
+ADD_MUSIC (Lyric_combine_music);