X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=6dce40a464ba7b385f0149dd254debd7de9b6ecd;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=ffae2783ba2d409ea3b6ccf445ef6a3476feff72;hpb=2236ce5873feb1e196a6dc27c85e13fd730ae1a7;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index ffae2783ba..6dce40a464 100644
--- 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--2011 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
@@ -71,19 +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",
-				      get_property ("lyricMelismaAlignment"));
-	}
+        {
+          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;
@@ -93,13 +103,13 @@ get_voice_to_lyrics (Context *lyrics)
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
-  else if (nm == "")
+  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;
@@ -134,17 +144,17 @@ get_current_note_head (Context *voice, bool include_grace_notes)
       Grob *g = unsmob_grob (scm_cdar (s));;
       Moment *end_mom = unsmob_moment (scm_caar (s));
       if (!end_mom || !g)
-	{
-	  programming_error ("busyGrobs invalid");
-	  continue;
-	}
+        {
+          programming_error ("busyGrobs invalid");
+          continue;
+        }
 
-      if (((end_mom->main_part_ > now.main_part_) ||
-           (include_grace_notes && end_mom->grace_part_ > now.grace_part_))
+      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 g;
         }
     }
 
@@ -159,24 +169,25 @@ Lyric_engraver::stop_translation_timestep ()
       Context *voice = get_voice_to_lyrics (context ());
 
       if (voice)
-	{
-	  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));
-	    }
-	}
+        {
+          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;
@@ -185,17 +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 */
-		"ignoreMelismata "
-		"includeGraceNotes "
-		"lyricMelismaAlignment ",
+                /* read */
+                "ignoreMelismata "
+                "includeGraceNotes "
+                "lyricMelismaAlignment "
+                "searchForVoice",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );