X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=6dce40a464ba7b385f0149dd254debd7de9b6ecd;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=4c76e189cddfe9eb280235a53bde8cde740c4eb3;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 4c76e189cd..6dce40a464 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -1,19 +1,31 @@ /* - lyric-engraver.cc -- implement Lyric_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2005 Han-Wen Nienhuys + Copyright (C) 1997--2014 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "context.hh" #include "engraver.hh" -#include "font-metric.hh" #include "item.hh" -#include "multi-measure-rest.hh" #include "note-head.hh" -#include "rest.hh" +#include "stream-event.hh" +#include "international.hh" + +#include "translator.icc" /** Generate texts for lyric syllables. We only do one lyric at a time. @@ -23,14 +35,14 @@ class Lyric_engraver : public Engraver { protected: void stop_translation_timestep (); - virtual bool try_music (Music *); void process_music (); + DECLARE_TRANSLATOR_LISTENER (lyric); public: TRANSLATOR_DECLARATIONS (Lyric_engraver); private: - Music *event_; + Stream_event *event_; Item *text_; Item *last_text_; @@ -44,15 +56,11 @@ Lyric_engraver::Lyric_engraver () event_ = 0; } -bool -Lyric_engraver::try_music (Music *r) +IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric); +void +Lyric_engraver::listen_lyric (Stream_event *ev) { - if (!event_) - { - event_ = r; - return true; - } - return false; + ASSIGN_EVENT_ONCE (event_, ev); } void @@ -62,36 +70,46 @@ Lyric_engraver::process_music () { SCM text = event_->get_property ("text"); - if (ly_is_equal (text, scm_makfrom0str (" "))) - { - if (last_text_) - last_text_->set_property ("self-alignment-X", scm_from_int (LEFT)); - } + if (ly_is_equal (text, scm_from_locale_string (" "))) + { + if (last_text_) + last_text_->set_property ("self-alignment-X", + get_property ("lyricMelismaAlignment")); + } else - { - text_ = make_item ("LyricText", event_->self_scm ()); - text_->set_property ("text", text); - } + 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 * 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; SCM voice_name = lyrics->get_property ("associatedVoice"); - String nm = lyrics->id_string (); + string nm = lyrics->id_string (); if (scm_is_string (voice_name)) nm = ly_scm2string (voice_name); + else if (nm == "" || !searchForVoice) + return 0; else { - int idx = nm.index_last ('-'); - if (idx >= 0) - nm = nm.left_string (idx); + ssize idx = nm.rfind ('-'); + if (idx != NPOS) + nm = nm.substr (0, idx); } Context *parent = lyrics; @@ -117,16 +135,27 @@ get_voice_to_lyrics (Context *lyrics) } Grob * -get_current_note_head (Context *voice) +get_current_note_head (Context *voice, bool include_grace_notes) { + Moment now = voice->now_mom (); for (SCM s = voice->get_property ("busyGrobs"); scm_is_pair (s); s = scm_cdr (s)) { - Item *g = dynamic_cast (unsmob_grob (scm_cdar (s))); - - if (g && !g->get_column () - && Note_head::has_interface (g)) - return g; + Grob *g = unsmob_grob (scm_cdar (s));; + Moment *end_mom = unsmob_moment (scm_caar (s)); + if (!end_mom || !g) + { + programming_error ("busyGrobs invalid"); + continue; + } + + if (((end_mom->main_part_ > now.main_part_) + || (include_grace_notes && end_mom->grace_part_ > now.grace_part_)) + && dynamic_cast (g) + && Note_head::has_interface (g)) + { + return g; + } } return 0; @@ -140,16 +169,25 @@ Lyric_engraver::stop_translation_timestep () Context *voice = get_voice_to_lyrics (context ()); if (voice) - { - Grob *head = get_current_note_head (voice); - - if (head) - { - text_->set_parent (head, X_AXIS); - if (melisma_busy (voice)) - text_->set_property ("self-alignment-X", scm_from_int (LEFT)); - } - } + { + 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)); + } + } last_text_ = text_; text_ = 0; @@ -157,11 +195,19 @@ Lyric_engraver::stop_translation_timestep () event_ = 0; } -#include "translator.icc" - ADD_TRANSLATOR (Lyric_engraver, - /* doc */ "", - /* create */ "LyricText", - /* accept */ "lyric-event", - /* read */ "", - /* write */ ""); + /* doc */ + "Engrave text for lyrics.", + + /* create */ + "LyricText ", + + /* read */ + "ignoreMelismata " + "includeGraceNotes " + "lyricMelismaAlignment " + "searchForVoice", + + /* write */ + "" + );