X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=cdee61517e333f4c6a554c973b27c11555d8835c;hb=c5847c9329abba798fb15bb336c7247ab149660b;hp=da7102b1f7212bfef8c534b2158823c42db4ee96;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index da7102b1f7..cdee61517e 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -1,79 +1,211 @@ /* - lyric-engraver.cc -- implement Lyric_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys + Jan Nieuwenhuizen - (c) 1997--1998 Han-Wen Nienhuys + 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 "lyric-engraver.hh" -#include "musical-request.hh" -#include "text-item.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "paper-def.hh" -#include "main.hh" +#include "context.hh" +#include "engraver.hh" +#include "item.hh" +#include "note-head.hh" +#include "stream-event.hh" +#include "international.hh" + +#include "translator.icc" -Lyric_engraver::Lyric_engraver() +/** + 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 { - lreq_l_ =0; - lyric_item_p_ =0; -} +protected: + void stop_translation_timestep (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (lyric); -bool -Lyric_engraver::do_try_request (Request*r) +public: + TRANSLATOR_DECLARATIONS (Lyric_engraver); + +private: + Stream_event *event_; + Item *text_; + Item *last_text_; + + Context *get_voice_context (); +}; + +Lyric_engraver::Lyric_engraver () { - Musical_req * m =dynamic_cast (r); - if (!m || ! dynamic_cast (m)) - return false; - lreq_l_ = dynamic_cast (m); + text_ = 0; + last_text_ = 0; + event_ = 0; +} - return true; +IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric); +void +Lyric_engraver::listen_lyric (Stream_event *ev) +{ + ASSIGN_EVENT_ONCE (event_, ev); } void -Lyric_engraver::do_process_requests() +Lyric_engraver::process_music () { - if (lreq_l_) + if (event_) { - Text_def *td_p = new Text_def; - td_p->text_str_ = lreq_l_->text_str_; - td_p->align_dir_ = LEFT; - Scalar style = get_property ("textstyle"); - if (style.length_i ()) - { - td_p->style_str_ = style; - } - Scalar alignment = get_property ("textalignment"); - if (alignment.isnum_b()) - { - td_p->align_dir_= (Direction)(int)alignment; - } - - lyric_item_p_ = new Text_item (td_p); - - lyric_item_p_->dir_ = DOWN; - lyric_item_p_->fat_b_ = true; - announce_element (Score_element_info (lyric_item_p_, lreq_l_)); + SCM text = event_->get_property ("text"); + + 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 ()); } + + 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")); } -void -Lyric_engraver::do_post_move_processing() +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 (avc)) + { + if (!c->is_removable ()) + 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); + } + + 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; + + return find_context_near (lyrics, voice_type, ""); +} + +Grob * +get_current_note_head (Context *voice) { - lreq_l_ =0; + Moment now = voice->now_mom (); + for (SCM s = voice->get_property ("busyGrobs"); + scm_is_pair (s); s = scm_cdr (s)) + { + Grob *g = unsmob (scm_cdar (s));; + Moment *end_mom = unsmob (scm_caar (s)); + if (!end_mom || !g) + { + programming_error ("busyGrobs invalid"); + continue; + } + + // 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) + && has_interface (g)) + { + return g; + } + } + + return 0; } void -Lyric_engraver::do_pre_move_processing() +Lyric_engraver::stop_translation_timestep () { - if (lyric_item_p_) + if (text_) { - typeset_element (lyric_item_p_); - lyric_item_p_ =0; + Context *voice = get_voice_to_lyrics (context ()); + + if (voice) + { + 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; } + event_ = 0; } +ADD_TRANSLATOR (Lyric_engraver, + /* doc */ + "Engrave text for lyrics.", + + /* create */ + "LyricText ", + + /* read */ + "ignoreMelismata " + "lyricMelismaAlignment " + "searchForVoice", -IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver); -ADD_THIS_TRANSLATOR(Lyric_engraver); + /* write */ + "" + );