X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=6dce40a464ba7b385f0149dd254debd7de9b6ecd;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=1c206a81fd9fc9b16b24652f2aa03a98ed1d5d46;hpb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 1c206a81fd..6dce40a464 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--2008 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
+  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"
@@ -60,20 +71,29 @@ Lyric_engraver::process_music ()
       SCM text = event_->get_property ("text");
 
       if (ly_is_equal (text, scm_from_locale_string (" ")))
-	{
-	  if (last_text_)
-	    last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
-	}
+        {
+          if (last_text_)
+            last_text_->set_property ("self-alignment-X",
+                                      get_property ("lyricMelismaAlignment"));
+        }
       else
-	{
-	  text_ = make_item ("LyricText", event_->self_scm ());
-	}
+        text_ = make_item ("LyricText", event_->self_scm ());
     }
+
+  Context *voice = get_voice_to_lyrics (context ());
+  if (last_text_
+      && voice
+      && to_boolean (voice->get_property ("melismaBusy"))
+      && !to_boolean (context ()->get_property ("ignoreMelismata")))
+    last_text_->set_property ("self-alignment-X",
+                              get_property ("lyricMelismaAlignment"));
 }
 
 Context *
 get_voice_to_lyrics (Context *lyrics)
 {
+  bool searchForVoice = to_boolean (lyrics->get_property ("searchForVoice"));
+
   SCM avc = lyrics->get_property ("associatedVoiceContext");
   if (Context *c = unsmob_context (avc))
     return c;
@@ -83,15 +103,13 @@ get_voice_to_lyrics (Context *lyrics)
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
-  else if (nm == "")
-    {
-      return 0;
-    }
+  else if (nm == "" || !searchForVoice)
+    return 0;
   else
     {
       ssize idx = nm.rfind ('-');
       if (idx != NPOS)
-	nm = nm.substr (0, idx);
+        nm = nm.substr (0, idx);
     }
 
   Context *parent = lyrics;
@@ -117,7 +135,7 @@ get_voice_to_lyrics (Context *lyrics)
 }
 
 Grob *
-get_current_note_head (Context *voice)
+get_current_note_head (Context *voice, bool include_grace_notes)
 {
   Moment now = voice->now_mom ();
   for (SCM s = voice->get_property ("busyGrobs");
@@ -126,15 +144,18 @@ get_current_note_head (Context *voice)
       Grob *g = unsmob_grob (scm_cdar (s));;
       Moment *end_mom = unsmob_moment (scm_caar (s));
       if (!end_mom || !g)
-	{
-	  programming_error ("busyGrobs invalid");
-	  continue;
-	}
-      
-      if (end_mom->main_part_ > now.main_part_
-	  && dynamic_cast<Item *> (g)
-	  && Note_head::has_interface (g))
-	return g;
+        {
+          programming_error ("busyGrobs invalid");
+          continue;
+        }
+
+      if (((end_mom->main_part_ > now.main_part_)
+           || (include_grace_notes && end_mom->grace_part_ > now.grace_part_))
+          && dynamic_cast<Item *> (g)
+          && Note_head::has_interface (g))
+        {
+          return g;
+        }
     }
 
   return 0;
@@ -146,23 +167,27 @@ Lyric_engraver::stop_translation_timestep ()
   if (text_)
     {
       Context *voice = get_voice_to_lyrics (context ());
- 
+
       if (voice)
-	{
-	  Grob *head = get_current_note_head (voice);
-
-	  if (head)
-	    {
-	      text_->set_parent (head, X_AXIS);
-	      if (melisma_busy (voice))
-		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));
-	    }
-	}
+        {
+          bool include_grace_notes = to_boolean (get_property ("includeGraceNotes"));
+          Grob *head = get_current_note_head (voice, include_grace_notes);
+
+          if (head)
+            {
+              text_->set_parent (head, 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_;
       text_ = 0;
@@ -171,14 +196,18 @@ Lyric_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Lyric_engraver,
-		/* doc */
-		"Engrave text for lyrics.",
+                /* doc */
+                "Engrave text for lyrics.",
+
+                /* create */
+                "LyricText ",
 
-		/* create */
-		"LyricText ",
-		/* read */
-		"lyricMelismaAlignment ",
+                /* read */
+                "ignoreMelismata "
+                "includeGraceNotes "
+                "lyricMelismaAlignment "
+                "searchForVoice",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );