/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
nm = nm.substr (0, idx);
}
+ SCM voice_type = lyrics->get_property ("associatedVoiceType");
+ if (!scm_is_symbol (voice_type))
+ return 0;
+
Context *parent = lyrics;
Context *voice = 0;
while (parent && !voice)
{
- voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm);
+ voice = find_context_below (parent, voice_type, nm);
parent = parent->get_parent_context ();
}
voice = 0;
while (parent && !voice)
{
- voice = find_context_below (parent, ly_symbol2scm ("Voice"), "");
+ voice = find_context_below (parent, voice_type, "");
parent = parent->get_parent_context ();
}
}
Grob *
-get_current_note_head (Context *voice, bool include_grace_notes)
+get_current_note_head (Context *voice)
{
Moment now = voice->now_mom ();
for (SCM s = voice->get_property ("busyGrobs");
continue;
}
- if (((end_mom->main_part_ > now.main_part_)
- || (include_grace_notes && end_mom->grace_part_ > now.grace_part_))
+ // It's a bit irritating that we just have the length and
+ // duration of the Grob.
+ Moment end_from_now =
+ get_event_length (Stream_event::unsmob (g->get_property ("cause")), now)
+ + now;
+ // We cannot actually include more than a single grace note
+ // using busyGrobs on ungraced lyrics since a grob ending on
+ // grace time will just have disappeared from busyGrobs by the
+ // time our ungraced lyrics appear. At best we may catch a
+ // single grace note.
+ //
+ // However, a single grace note ending on a non-grace time is
+ // indistinguishable from a proper note ending on a non-grace
+ // time. So we really have no way to obey includeGraceNotes
+ // here. Not with this mechanism.
+ if ((*end_mom == end_from_now)
&& dynamic_cast<Item *> (g)
&& Note_head::has_interface (g))
{
if (voice)
{
- bool include_grace_notes = to_boolean (get_property ("includeGraceNotes"));
- Grob *head = get_current_note_head (voice, include_grace_notes);
+ Grob *head = get_current_note_head (voice);
if (head)
{
/* read */
"ignoreMelismata "
- "includeGraceNotes "
"lyricMelismaAlignment "
"searchForVoice",