X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=bad1203266f75b43842e6bdea358b6a734dc339f;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c52cba8356cb59f25bfb678ef3e9dc164dc8e4b0;hpb=ac3dd3ad38528113d97f6a8a7b81751c328f1c36;p=lilypond.git diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index c52cba8356..bad1203266 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -36,7 +36,7 @@ class Lyric_engraver : public Engraver protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (lyric); + void listen_lyric (Stream_event *); public: TRANSLATOR_DECLARATIONS (Lyric_engraver); @@ -49,14 +49,14 @@ private: Context *get_voice_context (); }; -Lyric_engraver::Lyric_engraver () +Lyric_engraver::Lyric_engraver (Context *c) + : Engraver (c) { text_ = 0; last_text_ = 0; event_ = 0; } -IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric); void Lyric_engraver::listen_lyric (Stream_event *ev) { @@ -70,23 +70,23 @@ Lyric_engraver::process_music () { SCM text = event_->get_property ("text"); - if (ly_is_equal (text, scm_from_locale_string (" "))) - { - if (last_text_) - last_text_->set_property ("self-alignment-X", - get_property ("lyricMelismaAlignment")); - } + if (ly_is_equal (text, scm_from_ascii_string (" "))) + { + if (last_text_) + last_text_->set_property ("self-alignment-X", + get_property ("lyricMelismaAlignment")); + } else - text_ = make_item ("LyricText", event_->self_scm ()); + text_ = make_item ("LyricText", event_->self_scm ()); } - Context *voice = get_voice_to_lyrics (context ()); - if (last_text_ - && voice - && to_boolean (voice->get_property ("melismaBusy")) - && !to_boolean (context ()->get_property ("ignoreMelismata"))) - last_text_->set_property ("self-alignment-X", - get_property ("lyricMelismaAlignment")); + Context *voice = get_voice_to_lyrics (context ()); + if (last_text_ + && voice + && to_boolean (voice->get_property ("melismaBusy")) + && !to_boolean (context ()->get_property ("ignoreMelismata"))) + last_text_->set_property ("self-alignment-X", + get_property ("lyricMelismaAlignment")); } Context * @@ -95,8 +95,11 @@ get_voice_to_lyrics (Context *lyrics) bool searchForVoice = to_boolean (lyrics->get_property ("searchForVoice")); SCM avc = lyrics->get_property ("associatedVoiceContext"); - if (Context *c = unsmob_context (avc)) - return c; + if (Context *c = unsmob (avc)) + { + if (!c->is_removable ()) + return c; + } SCM voice_name = lyrics->get_property ("associatedVoice"); string nm = lyrics->id_string (); @@ -109,52 +112,55 @@ get_voice_to_lyrics (Context *lyrics) { ssize idx = nm.rfind ('-'); if (idx != NPOS) - nm = nm.substr (0, idx); + nm = nm.substr (0, idx); } - Context *parent = lyrics; - Context *voice = 0; - while (parent && !voice) - { - voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm); - parent = parent->get_parent_context (); - } + SCM voice_type = lyrics->get_property ("associatedVoiceType"); + if (!scm_is_symbol (voice_type)) + return 0; + Context *voice = find_context_near (lyrics, voice_type, nm); if (voice) return voice; - parent = lyrics; - voice = 0; - while (parent && !voice) - { - voice = find_context_below (parent, ly_symbol2scm ("Voice"), ""); - parent = parent->get_parent_context (); - } - - return voice; + return find_context_near (lyrics, voice_type, ""); } 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"); 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 = unsmob (scm_cdar (s));; + Moment *end_mom = unsmob (scm_caar (s)); if (!end_mom || !g) - { - programming_error ("busyGrobs invalid"); - continue; - } + { + programming_error ("busyGrobs invalid"); + 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 (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 (g) - && Note_head::has_interface (g)) + && has_interface (g)) { - return g; + return g; } } @@ -169,24 +175,18 @@ Lyric_engraver::stop_translation_timestep () Context *voice = get_voice_to_lyrics (context ()); if (voice) - { - bool include_grace_notes = to_boolean (get_property ("includeGraceNotes")); - Grob *head = get_current_note_head (voice, include_grace_notes); - - if (head) - { - text_->set_parent (head, 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)); - } - } + { + Grob *head = get_current_note_head (voice); + + if (head) + { + 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")); + } + } last_text_ = text_; text_ = 0; @@ -194,19 +194,24 @@ Lyric_engraver::stop_translation_timestep () event_ = 0; } +void +Lyric_engraver::boot () +{ + ADD_LISTENER (Lyric_engraver, lyric); +} + ADD_TRANSLATOR (Lyric_engraver, - /* doc */ - "Engrave text for lyrics.", + /* doc */ + "Engrave text for lyrics.", - /* create */ - "LyricText ", + /* create */ + "LyricText ", - /* read */ - "ignoreMelismata " - "includeGraceNotes " - "lyricMelismaAlignment " - "searchForVoice", + /* read */ + "ignoreMelismata " + "lyricMelismaAlignment " + "searchForVoice", - /* write */ - "" - ); + /* write */ + "" + );