Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 75556716ec83cd3057ec78af55d873c656fff4f0..06ffce0d50ad4cc354015a88e4e623beb2d1da53 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -9,12 +9,10 @@
 
 #include "context.hh"
 #include "engraver.hh"
-#include "font-metric.hh"
 #include "item.hh"
-#include "multi-measure-rest.hh"
 #include "note-head.hh"
-#include "rest.hh"
 #include "stream-event.hh"
+#include "international.hh"
 
 #include "translator.icc"
 
@@ -147,6 +145,11 @@ Lyric_engraver::stop_translation_timestep ()
              if (melisma_busy (voice))
                text_->set_property ("self-alignment-X", scm_from_int (LEFT));
            }
+         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_;