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>
*/
: Music (l)
{
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);