Remove warning when there are no noteheads to attach lyrics to.

[lilypond.git] / lily / lyric-engraver.cc

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index f6356330f828707061abaa78c2f3b4ac46b88b99..bbe15845a61a77379c070b6839637d69c4c1a507 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -175,17 +175,12 @@ Lyric_engraver::stop_translation_timestep ()
 
           if (head)
             {
-              text_->set_parent (head, X_AXIS);
+              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"));
             }
-          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_;