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>
*/
#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.
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 ();
};
Lyric_engraver::Lyric_engraver ()
{
text_ = 0;
+ last_text_ = 0;
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
{
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);
+ }
}
}
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;
{
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 */ "");