X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=74d15e4df1faedef65fddc857260b3fe33c46c5e;hb=13ca4123d326ade652522703a5d15186971318e2;hp=dbb159b8afa7bf07bcd61f3875b3d275adb5dfc5;hpb=9c31b0d42a407a412a324a6586cfb0437de4bfd8;p=lilypond.git diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index dbb159b8af..74d15e4df1 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -3,54 +3,53 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys Jan Nieuwenhuizen */ +#include "context.hh" #include "engraver.hh" -#include "event.hh" #include "item.hh" -#include "context.hh" -#include "font-metric.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 (); - + void stop_translation_timestep (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (lyric); + public: TRANSLATOR_DECLARATIONS (Lyric_engraver); + private: - Music * event_; - Item* text_; + Stream_event *event_; + Item *text_; + Item *last_text_; - Context* get_voice_context (); + Context *get_voice_context (); }; Lyric_engraver::Lyric_engraver () { - text_ =0; - event_ =0; + text_ = 0; + last_text_ = 0; + event_ = 0; } -bool -Lyric_engraver::try_music (Music*r) +IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric); +void +Lyric_engraver::listen_lyric (Stream_event *ev) { - if (r->is_mus_type ("lyric-event")) - { - if (event_) - return false; - event_ =r; - return true; - } - return false; + ASSIGN_EVENT_ONCE (event_, ev); } void @@ -58,55 +57,83 @@ Lyric_engraver::process_music () { if (event_) { - text_= make_item ("LyricText"); - - text_->set_property ("text", event_->get_property ("text")); - announce_grob (text_, event_->self_scm ()); + 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 ()); } } - -Context* +Context * get_voice_to_lyrics (Context *lyrics) { SCM avc = lyrics->get_property ("associatedVoiceContext"); - if (Context *c = unsmob_context (avc)) + if (Context *c = unsmob_context (avc)) return c; - SCM voice = lyrics->get_property ("associatedVoice"); - String nm = lyrics->id_string_; + SCM voice_name = lyrics->get_property ("associatedVoice"); + string nm = lyrics->id_string (); - if (gh_string_p (voice)) - nm = ly_scm2string (voice); + if (scm_is_string (voice_name)) + nm = ly_scm2string (voice_name); + else if (nm == "") + 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; + Context *voice = 0; + while (parent && !voice) + { + voice = find_context_below (parent, ly_symbol2scm ("Voice"), nm); + parent = parent->get_parent_context (); } - Context *c = lyrics->find_context_below (ly_symbol2scm ("Voice"), nm); + if (voice) + return voice; - if (c) - return c; + parent = lyrics; + voice = 0; + while (parent && !voice) + { + voice = find_context_below (parent, ly_symbol2scm ("Voice"), ""); + parent = parent->get_parent_context (); + } - return lyrics->find_context_below (ly_symbol2scm ("Voice"), ""); + return voice; } Grob * -get_current_note_head (Context * voice) +get_current_note_head (Context *voice) { + Moment now = voice->now_mom (); for (SCM s = voice->get_property ("busyGrobs"); - gh_pair_p (s); s = gh_cdr (s)) + scm_is_pair (s); s = scm_cdr (s)) { - Item*g = dynamic_cast (unsmob_grob (gh_cdar (s))); - - if (g && !g->get_column () + 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_ + && dynamic_cast (g) && Note_head::has_interface (g)) return g; } - - return 0; + + return 0; } void @@ -114,7 +141,7 @@ Lyric_engraver::stop_translation_timestep () { if (text_) { - Context * voice = get_voice_to_lyrics (daddy_context_); + Context *voice = get_voice_to_lyrics (context ()); if (voice) { @@ -123,22 +150,35 @@ Lyric_engraver::stop_translation_timestep () if (head) { text_->set_parent (head, X_AXIS); - if (melisma_busy (voice)) - text_->set_property ("self-alignment-X", gh_int2scm (LEFT)); + 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)); } } - - typeset_grob (text_); - text_ =0; + + last_text_ = text_; + text_ = 0; } - event_ =0; + event_ = 0; } +ADD_TRANSLATOR (Lyric_engraver, + /* doc */ + "Engrave text for lyrics.", + + /* create */ + "LyricText ", + + /* read */ + "ignoreMelismata " + "lyricMelismaAlignment ", -ENTER_DESCRIPTION (Lyric_engraver, -/* descr */ "", -/* creats*/ "", -/* accepts */ "lyric-event", -/* acks */ "", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );