X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=afcfdf90153be10d9ab954ca2263c1306320115e;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=3bc2c121bf961fb59f909dbeff0b8c99f26bf28b;hpb=8d1d9740b8d0ed9a2315909c7fdcccdf68894889;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 3bc2c121bf..afcfdf9015 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,27 +71,31 @@ 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")))
-      last_text_->set_property ("self-alignment-X",
-	                        get_property ("lyricMelismaAlignment"));
+  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))
+  if (Context *c = Context::unsmob (avc))
     return c;
 
   SCM voice_name = lyrics->get_property ("associatedVoice");
@@ -99,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;
@@ -137,20 +141,20 @@ get_current_note_head (Context *voice, bool include_grace_notes)
   for (SCM s = voice->get_property ("busyGrobs");
        scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob *g = unsmob_grob (scm_cdar (s));;
-      Moment *end_mom = unsmob_moment (scm_caar (s));
+      Grob *g = Grob::unsmob (scm_cdar (s));;
+      Moment *end_mom = Moment::unsmob (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;
         }
     }
 
@@ -165,24 +169,19 @@ 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->get_parent(X_AXIS), X_AXIS);
+              if (melisma_busy (voice)
+                  && !to_boolean (get_property ("ignoreMelismata")))
+                text_->set_property ("self-alignment-X",
+                                     get_property ("lyricMelismaAlignment"));
+            }
+        }
 
       last_text_ = text_;
       text_ = 0;
@@ -191,17 +190,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 */
+                ""
+               );