(parse_symbol_list): Bugfix.

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 75c28f91174f47d51a9cb2b53f770dee94844aa3..4c76e189cddfe9eb280235a53bde8cde740c4eb3 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -22,9 +22,9 @@
 class Lyric_engraver : public Engraver
 {
 protected:
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  void stop_translation_timestep ();
   virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void process_music ();
 
 public:
   TRANSLATOR_DECLARATIONS (Lyric_engraver);
@@ -32,6 +32,7 @@ public:
 private:
   Music *event_;
   Item *text_;
+  Item *last_text_;
 
   Context *get_voice_context ();
 };
@@ -39,6 +40,7 @@ private:
 Lyric_engraver::Lyric_engraver ()
 {
   text_ = 0;
+  last_text_ = 0;
   event_ = 0;
 }
 
@@ -58,8 +60,18 @@ Lyric_engraver::process_music ()
 {
   if (event_)
     {
-      text_ = make_item ("LyricText", event_->self_scm ());
-      text_->set_property ("text", event_->get_property ("text"));
+      SCM text = event_->get_property ("text");
+
+      if (ly_is_equal (text, scm_makfrom0str (" ")))
+       {
+         if (last_text_)
+           last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
+       }
+      else
+       {
+         text_ = make_item ("LyricText", event_->self_scm ());
+         text_->set_property ("text", text);
+       }
     }
 }
 
@@ -135,10 +147,11 @@ Lyric_engraver::stop_translation_timestep ()
            {
              text_->set_parent (head, X_AXIS);
              if (melisma_busy (voice))
-               text_->set_property ("self-alignment-X", scm_int2num (LEFT));
+               text_->set_property ("self-alignment-X", scm_from_int (LEFT));
            }
        }
 
+      last_text_ = text_;
       text_ = 0;
     }
   event_ = 0;
@@ -147,9 +160,8 @@ Lyric_engraver::stop_translation_timestep ()
 #include "translator.icc"
 
 ADD_TRANSLATOR (Lyric_engraver,
-               /* descr */ "",
-               /* creats*/ "LyricText",
-               /* accepts */ "lyric-event",
-               /* acks  */ "",
-               /* reads */ "",
+               /* doc */ "",
+               /* create */ "LyricText",
+               /* accept */ "lyric-event",
+               /* read */ "",
                /* write */ "");