X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=0d4392d48639b152148ec441633be16c7f49f514;hb=2be50a355fc735ee7dedb6b8964888bb3d6934af;hp=fa5c1035d1dfa8b8e57024d592ba00b95a9a46de;hpb=25c92bfff1189d93b80cdef0da0d570d14834c8d;p=lilypond.git diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index fa5c1035d1..0d4392d486 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -1,69 +1,200 @@ /* - 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--1999 Han-Wen Nienhuys + Copyright (C) 1997--2010 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 "item.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. + Multiple copies of this engraver should be used to do multiple voices. */ +class Lyric_engraver : public Engraver +{ +protected: + void stop_translation_timestep (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (lyric); -#include "lyric-engraver.hh" -#include "musical-request.hh" -#include "g-text-item.hh" -#include "paper-def.hh" -#include "lookup.hh" +public: + TRANSLATOR_DECLARATIONS (Lyric_engraver); -ADD_THIS_TRANSLATOR (Lyric_engraver); +private: + Stream_event *event_; + Item *text_; + Item *last_text_; + Context *get_voice_context (); +}; -Lyric_engraver::Lyric_engraver() +Lyric_engraver::Lyric_engraver () { - text_p_ =0; - req_l_ =0; + text_ = 0; + last_text_ = 0; + event_ = 0; } -bool -Lyric_engraver::do_try_music (Music*r) +IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric); +void +Lyric_engraver::listen_lyric (Stream_event *ev) { - if (Lyric_req* l = dynamic_cast (r)) + ASSIGN_EVENT_ONCE (event_, ev); +} + +void +Lyric_engraver::process_music () +{ + if (event_) { - if (req_l_) - return false; - req_l_ =l; - return true; + 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", scm_from_int (LEFT)); + } + else + text_ = make_item ("LyricText", event_->self_scm ()); } - return false; } -void -Lyric_engraver::do_process_requests() +Context * +get_voice_to_lyrics (Context *lyrics) { - if (req_l_) + 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 == "") + return 0; + else { - text_p_= new G_text_item; - text_p_->text_str_ = req_l_->text_str_; - - Scalar style = get_property ("textstyle", 0); - if (style.length_i ()) - text_p_->style_str_ = style; - - announce_element (Score_element_info (text_p_, req_l_)); + ssize idx = nm.rfind ('-'); + if (idx != NPOS) + 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 (); + } + + 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::do_pre_move_processing() +Grob * +get_current_note_head (Context *voice, bool include_grace_notes) { - if (text_p_) + Moment now = voice->now_mom (); + for (SCM s = voice->get_property ("busyGrobs"); + scm_is_pair (s); s = scm_cdr (s)) { - typeset_element (text_p_); - text_p_ =0; + 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 -Lyric_engraver::do_post_move_processing () +Lyric_engraver::stop_translation_timestep () { - req_l_ =0; + if (text_) + { + 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; } +ADD_TRANSLATOR (Lyric_engraver, + /* doc */ + "Engrave text for lyrics.", + + /* create */ + "LyricText ", + + /* read */ + "ignoreMelismata " + "includeGraceNotes " + "lyricMelismaAlignment ", + + /* write */ + "" + );