/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
bool searchForVoice = to_boolean (lyrics->get_property ("searchForVoice"));
SCM avc = lyrics->get_property ("associatedVoiceContext");
- if (Context *c = unsmob_context (avc))
+ if (Context *c = Context::unsmob (avc))
return c;
SCM voice_name = lyrics->get_property ("associatedVoice");
for (SCM s = voice->get_property ("busyGrobs");
scm_is_pair (s); s = scm_cdr (s))
{
- Grob *g = unsmob_grob (scm_cdar (s));;
- Moment *end_mom = unsmob_moment (scm_caar (s));
+ Grob *g = Grob::unsmob (scm_cdar (s));;
+ Moment *end_mom = Moment::unsmob (scm_caar (s));
if (!end_mom || !g)
{
programming_error ("busyGrobs invalid");
if (head)
{
- text_->set_parent (head, X_AXIS);
+ text_->set_parent (head->get_parent(X_AXIS), X_AXIS);
if (melisma_busy (voice)
&& !to_boolean (get_property ("ignoreMelismata")))
text_->set_property ("self-alignment-X",
get_property ("lyricMelismaAlignment"));
}
- else
- {
- text_->warning (_ ("Lyric syllable does not have note. Use \\lyricsto or associatedVoice."));
- text_->set_property ("X-offset", scm_from_int (0));
- }
}
last_text_ = text_;