X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=c52cba8356cb59f25bfb678ef3e9dc164dc8e4b0;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=33ced391727d08548a77fa19ddf1473864f8b8ee;hpb=366ac5a9c6dfb5a32111c8dd6ba40e49334402c3;p=lilypond.git diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 33ced39172..c52cba8356 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -1,70 +1,164 @@ /* - 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--2003 Han-Wen Nienhuys + Copyright (C) 1997--2011 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 "event.hh" #include "item.hh" -#include "paper-def.hh" -#include "font-metric.hh" -#include "side-position-interface.hh" +#include "note-head.hh" +#include "stream-event.hh" +#include "international.hh" + +#include "translator.icc" /** - Generate texts for lyric syllables. We only do one lyric at a time. + Generate texts for lyric syllables. We only do one lyric at a time. Multiple copies of this engraver should be used to do multiple voices. - */ -class Lyric_engraver : public Engraver +*/ +class Lyric_engraver : public Engraver { protected: - virtual void stop_translation_timestep (); - virtual bool try_music (Music *); - virtual void process_music (); - virtual void start_translation_timestep (); - + void stop_translation_timestep (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (lyric); + public: - TRANSLATOR_DECLARATIONS(Lyric_engraver); + TRANSLATOR_DECLARATIONS (Lyric_engraver); + private: - Music * req_; - Item* text_; -}; + Stream_event *event_; + Item *text_; + Item *last_text_; + Context *get_voice_context (); +}; +Lyric_engraver::Lyric_engraver () +{ + text_ = 0; + last_text_ = 0; + event_ = 0; +} +IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric); +void +Lyric_engraver::listen_lyric (Stream_event *ev) +{ + ASSIGN_EVENT_ONCE (event_, ev); +} -Lyric_engraver::Lyric_engraver () +void +Lyric_engraver::process_music () { - text_ =0; - req_ =0; + if (event_) + { + 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")); + } + else + 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")); } -bool -Lyric_engraver::try_music (Music*r) +Context * +get_voice_to_lyrics (Context *lyrics) { - if (r->is_mus_type ("lyric-event")) + 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 (); + + if (scm_is_string (voice_name)) + nm = ly_scm2string (voice_name); + else if (nm == "" || !searchForVoice) + return 0; + else + { + ssize idx = nm.rfind ('-'); + if (idx != NPOS) + nm = nm.substr (0, idx); + } + + Context *parent = lyrics; + Context *voice = 0; + while (parent && !voice) { - if (req_) - return false; - req_ =r; - return true; + voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm); + parent = parent->get_parent_context (); } - return false; + + 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; } -void -Lyric_engraver::process_music () +Grob * +get_current_note_head (Context *voice, bool include_grace_notes) { - if (req_) + Moment now = voice->now_mom (); + for (SCM s = voice->get_property ("busyGrobs"); + scm_is_pair (s); s = scm_cdr (s)) { - text_= new Item (get_property ("LyricText")); - - text_->set_grob_property ("text", req_->get_mus_property ("text")); - announce_grob (text_, req_->self_scm()); + 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; } void @@ -72,22 +166,47 @@ Lyric_engraver::stop_translation_timestep () { if (text_) { - typeset_grob (text_); - text_ =0; + 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)); + } + } + + last_text_ = text_; + text_ = 0; } + event_ = 0; } -void -Lyric_engraver::start_translation_timestep () -{ - req_ =0; -} +ADD_TRANSLATOR (Lyric_engraver, + /* doc */ + "Engrave text for lyrics.", + + /* create */ + "LyricText ", + /* read */ + "ignoreMelismata " + "includeGraceNotes " + "lyricMelismaAlignment " + "searchForVoice", -ENTER_DESCRIPTION(Lyric_engraver, -/* descr */ "", -/* creats*/ "", -/* accepts */ "lyric-event", -/* acks */ "", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );