From af2ba0e92988568cd4f61681c6416d6ddf1f1572 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:56:49 +0000 Subject: [PATCH] lilypond-1.3.94 --- lily/include/lyric-phrasing-engraver.hh | 1 - lily/include/repeated-music.hh | 3 --- lily/lyric-phrasing-engraver.cc | 10 ++++++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lily/include/lyric-phrasing-engraver.hh b/lily/include/lyric-phrasing-engraver.hh index cda6f6584a..6888caa1b1 100644 --- a/lily/include/lyric-phrasing-engraver.hh +++ b/lily/include/lyric-phrasing-engraver.hh @@ -23,7 +23,6 @@ class Syllable_group; right aligning end of phrases, centering others under their notes. */ - /* * Build an engraver that catches noteheads and lyrics. diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 3c70ae5a30..beca7dc1d0 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -49,10 +49,7 @@ */ class Repeated_music : public Music { - Music * repeat_body_p_; - Music_sequence * alternatives_p_; public: - Music * body () const; Music_sequence * alternatives () const; String type_; diff --git a/lily/lyric-phrasing-engraver.cc b/lily/lyric-phrasing-engraver.cc index 5cc40bc936..26b2a97452 100644 --- a/lily/lyric-phrasing-engraver.cc +++ b/lily/lyric-phrasing-engraver.cc @@ -18,6 +18,12 @@ String trim_suffix(String &id); ADD_THIS_TRANSLATOR (Lyric_phrasing_engraver); +/* + TODO: this code is too hairy, and does things that should be in the + backend. Fixme. +*/ + + /* We find start and end of phrases, and align lyrics accordingly. Also, lyrics at start of melismata should be left aligned. @@ -241,6 +247,10 @@ void Lyric_phrasing_engraver::process_acknowledged () // ((current . oldflag) . previous) if(!to_boolean(gh_cdar(v_entry))) { // not an old entry left over from a prior note ... Syllable_group *entry = unsmob_voice_entry(gh_caar(v_entry)); + + /* + TODO: give context for warning. + */ if(! entry->set_lyric_align(punc.ch_C(), any_notehead_l_)) warning (_ ("lyrics found without any matching notehead")); -- 2.39.5