Run `make grand-replace'.

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index ae0464f97dd29fea92496270596ac2914c2473ee..1c206a81fd9fc9b16b24652f2aa03a98ed1d5d46 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -83,6 +83,10 @@ get_voice_to_lyrics (Context *lyrics)
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
+  else if (nm == "")
+    {
+      return 0;
+    }
   else
     {
       ssize idx = nm.rfind ('-');
@@ -142,7 +146,7 @@ Lyric_engraver::stop_translation_timestep ()
   if (text_)
     {
       Context *voice = get_voice_to_lyrics (context ());
-
+ 
       if (voice)
        {
          Grob *head = get_current_note_head (voice);
@@ -151,7 +155,7 @@ Lyric_engraver::stop_translation_timestep ()
            {
              text_->set_parent (head, X_AXIS);
              if (melisma_busy (voice))
-               text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+               text_->set_property ("self-alignment-X", get_property("lyricMelismaAlignment"));
            }
          else
            {
@@ -167,7 +171,14 @@ Lyric_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Lyric_engraver,
-               /* doc */ "",
-               /* create */ "LyricText",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Engrave text for lyrics.",
+
+               /* create */
+               "LyricText ",
+               /* read */
+               "lyricMelismaAlignment ",
+
+               /* write */
+               ""
+               );