X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=eaa96a5a6fb13c92d39bf5531194b476578c3f7a;hb=e62c1e205cd619afcc43fd8c8a9a2c5a093b508e;hp=22449890d9aa47f4b87f607726a621e53b67a050;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 22449890d9..eaa96a5a6f 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -1,10 +1,21 @@
 /*
-  lyric-engraver.cc -- implement Lyric_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "context.hh"
@@ -64,10 +75,11 @@ Lyric_engraver::process_music ()
 	  if (last_text_)
 	    last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
 	}
-      else
-	{
-	  text_ = make_item ("LyricText", event_->self_scm ());
-	}
+      /*
+        "Empty" LyricText objects are needed to allow the Extender_engraver to
+        distinguish between the end of a lyrics block and manual melismata.
+      */
+      text_ = make_item ("LyricText", event_->self_scm ());
     }
 }
 
@@ -84,9 +96,7 @@ get_voice_to_lyrics (Context *lyrics)
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
   else if (nm == "")
-    {
-      return 0;
-    }
+    return 0;
   else
     {
       ssize idx = nm.rfind ('-');
@@ -130,7 +140,7 @@ get_current_note_head (Context *voice)
 	  programming_error ("busyGrobs invalid");
 	  continue;
 	}
-      
+
       if (end_mom->main_part_ > now.main_part_
 	  && dynamic_cast<Item *> (g)
 	  && Note_head::has_interface (g))
@@ -146,7 +156,7 @@ Lyric_engraver::stop_translation_timestep ()
   if (text_)
     {
       Context *voice = get_voice_to_lyrics (context ());
- 
+
       if (voice)
 	{
 	  Grob *head = get_current_note_head (voice);
@@ -154,8 +164,10 @@ Lyric_engraver::stop_translation_timestep ()
 	  if (head)
 	    {
 	      text_->set_parent (head, X_AXIS);
-	      if (melisma_busy (voice))
-		text_->set_property ("self-alignment-X", get_property("lyricMelismaAlignment"));
+	      if (melisma_busy (voice)
+		  && !to_boolean (get_property ("ignoreMelismata")))
+		text_->set_property ("self-alignment-X",
+				     get_property("lyricMelismaAlignment"));
 	    }
 	  else
 	    {
@@ -176,7 +188,9 @@ ADD_TRANSLATOR (Lyric_engraver,
 
 		/* create */
 		"LyricText ",
+
 		/* read */
+		"ignoreMelismata "
 		"lyricMelismaAlignment ",
 
 		/* write */