(process_acknowledged): don't create

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 9e93dda4440a933d0840f93b883a42bd551d08c4..e11f4ec222156d18672805fa1338aabbf36d97c6 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -14,6 +14,9 @@
 #include "multi-measure-rest.hh"
 #include "note-head.hh"
 #include "rest.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 /**
    Generate texts for lyric syllables.  We only do one lyric at a time.
@@ -22,18 +25,18 @@
 class Lyric_engraver : public Engraver
 {
 protected:
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual bool try_music (Music *);
-  PRECOMPUTED_VIRTUAL void process_music ();
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 
 public:
   TRANSLATOR_DECLARATIONS (Lyric_engraver);
 
 private:
-  Music *event_;
+  Stream_event *event_;
   Item *text_;
   Item *last_text_;
-  
+
   Context *get_voice_context ();
 };
 
@@ -44,15 +47,11 @@ Lyric_engraver::Lyric_engraver ()
   event_ = 0;
 }
 
-bool
-Lyric_engraver::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric);
+void
+Lyric_engraver::listen_lyric (Stream_event *ev)
 {
-  if (!event_)
-    {
-      event_ = r;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (event_, ev);
 }
 
 void
@@ -61,11 +60,11 @@ Lyric_engraver::process_music ()
   if (event_)
     {
       SCM text = event_->get_property ("text");
-      
+
       if (ly_is_equal (text, scm_makfrom0str (" ")))
        {
          if (last_text_)
-           last_text_->set_property ("self-alignment-X", scm_int2num (LEFT));
+           last_text_->set_property ("self-alignment-X", scm_from_int (LEFT));
        }
       else
        {
@@ -83,15 +82,15 @@ get_voice_to_lyrics (Context *lyrics)
     return c;
 
   SCM voice_name = lyrics->get_property ("associatedVoice");
-  String nm = lyrics->id_string ();
+  string nm = lyrics->id_string ();
 
   if (scm_is_string (voice_name))
     nm = ly_scm2string (voice_name);
   else
     {
-      int idx = nm.index_last ('-');
-      if (idx >= 0)
-       nm = nm.left_string (idx);
+      ssize idx = nm.rfind ('-');
+      if (idx != NPOS)
+       nm = nm.substr (0, idx);
     }
 
   Context *parent = lyrics;
@@ -147,22 +146,19 @@ 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;
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Lyric_engraver,
-               /* descr */ "",
-               /* creats*/ "LyricText",
-               /* accepts */ "lyric-event",
-               /* acks  */ "",
-               /* reads */ "",
+               /* doc */ "",
+               /* create */ "LyricText",
+               /* accept */ "lyric-event",
+               /* read */ "",
                /* write */ "");