source file of the GNU LilyPond music typesetter
- (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
}
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);
music_l ()->compress (m);
}
+
+
Music*
Lyric_combine_music::music_l () 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
{
- 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);