lilypond-1.3.94

diff --git a/lily/include/lyric-phrasing-engraver.hh b/lily/include/lyric-phrasing-engraver.hh
index cda6f6584a6e1a7408a4ef9b3f00f91efe663582..6888caa1b1811260065d0d8d3822a11cb5132421 100644 (file)
--- 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 3c70ae5a3058a1ff7c1a84f36f5ea9cff78721c6..beca7dc1d053728839767e5f269b180d684069c0 100644 (file)
--- 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 5cc40bc936503dfbb5de4efe9ae4743bc8afa697..26b2a97452ebd4fc81c1c061e019f2cee653aee2 100644 (file)
--- 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"));