/*
- lyric-combine-music-iterator.cc -- implement Old_lyric_combine_music_iterator
+ new-lyric-combine-iterator.cc -- implement Lyric_combine_music_iterator
source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "context.hh"
-#include "music.hh"
-#include "note-head.hh"
#include "grob.hh"
+#include "input.hh"
+#include "international.hh"
#include "music-iterator.hh"
+#include "music.hh"
-class Old_lyric_combine_music_iterator : public Music_iterator
+class Lyric_combine_music_iterator : public Music_iterator
{
public:
- Old_lyric_combine_music_iterator ();
- Old_lyric_combine_music_iterator (Old_lyric_combine_music_iterator const &src);
+ Lyric_combine_music_iterator ();
+ Lyric_combine_music_iterator (Lyric_combine_music_iterator const &src);
DECLARE_SCHEME_CALLBACK (constructor, ());
protected:
virtual void construct_children ();
virtual void do_quit ();
virtual void process (Moment);
virtual Music_iterator *try_music_in_children (Music *) const;
-
+ virtual bool run_always ()const;
virtual bool ok () const;
virtual void derived_mark () const;
virtual void derived_substitute (Context *, Context *);
private:
- bool get_busy_status () const;
- bool melisma_busy ();
- Music *get_combine_lyrics () const;
- Music *get_combine_music () const;
+ bool start_new_syllable ();
+ void find_voice ();
+
+ bool pending_grace_lyric_;
+ bool music_found_;
+ bool made_association_;
+ Context *lyrics_context_;
+ Context *music_context_;
+ SCM lyricsto_voice_name_;
- Music_iterator *music_iter_;
Music_iterator *lyric_iter_;
};
-bool
-melisma_busy (Context *tr)
-{
- SCM melisma_properties = tr->get_property ("melismaBusyProperties");
- bool busy = false;
-
- for (; scm_is_pair (melisma_properties);
- melisma_properties = scm_cdr (melisma_properties))
- busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties)));
-
- return busy;
-}
-
/*
- Ugh, why static?
+ Ugh; this is a hack, let's not export this hack, so static.
*/
-Music *busy_req;
-Music *melisma_playing_req;
+static Music *busy_ev;
+static Music *start_ev;
+static Music *melisma_playing_ev;
-Old_lyric_combine_music_iterator::Old_lyric_combine_music_iterator ()
+Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
{
- music_iter_ = 0;
+ music_found_ = false;
+ made_association_ = false;
+ pending_grace_lyric_ = false;
lyric_iter_ = 0;
+ music_context_ = 0;
+ lyrics_context_ = 0;
- if (!busy_req)
+ /*
+ Ugh. out of place here.
+ */
+ if (!busy_ev)
{
- busy_req
+ busy_ev
= make_music_by_name (ly_symbol2scm ("BusyPlayingEvent"));
- melisma_playing_req
+ start_ev
+ = make_music_by_name (ly_symbol2scm ("StartPlayingEvent"));
+ melisma_playing_ev
= make_music_by_name (ly_symbol2scm ("MelismaPlayingEvent"));
}
}
+bool
+Lyric_combine_music_iterator::start_new_syllable ()
+{
+ bool b = music_context_->try_music (busy_ev);
+
+ if (!b)
+ return false;
+
+ if (!lyrics_context_)
+ return false;
+
+ if (!to_boolean (lyrics_context_->get_property ("ignoreMelismata")))
+ {
+ bool m = music_context_->try_music (melisma_playing_ev);
+ if (m)
+ return false;
+ }
+
+ return true;
+}
+
Moment
-Old_lyric_combine_music_iterator::pending_moment () const
+Lyric_combine_music_iterator::pending_moment () const
{
- Moment musnext = music_iter_->pending_moment ();
- return musnext;
+ Moment m;
+
+ m.set_infinite (1);
+
+ return m;
}
bool
-Old_lyric_combine_music_iterator::ok () const
+Lyric_combine_music_iterator::run_always () const
{
- return music_iter_->ok ();
+ return true;
+}
+
+bool
+Lyric_combine_music_iterator::ok () const
+{
+ return lyric_iter_ && lyric_iter_->ok ();
}
void
-Old_lyric_combine_music_iterator::derived_mark ()const
+Lyric_combine_music_iterator::derived_mark ()const
{
- if (music_iter_)
- scm_gc_mark (music_iter_->self_scm ());
if (lyric_iter_)
scm_gc_mark (lyric_iter_->self_scm ());
+ if (lyrics_context_)
+ scm_gc_mark (lyrics_context_->self_scm ());
+ if (music_context_)
+ scm_gc_mark (music_context_->self_scm ());
}
void
-Old_lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
+Lyric_combine_music_iterator::derived_substitute (Context *f, Context *t)
{
- if (music_iter_)
- music_iter_->substitute_outlet (f, t);
if (lyric_iter_)
lyric_iter_->substitute_outlet (f, t);
+ if (lyrics_context_ && lyrics_context_ == f)
+ lyrics_context_ = t;
+ if (music_context_ && music_context_ == f)
+ music_context_ = t;
}
-Music *
-Old_lyric_combine_music_iterator::get_combine_music () const
+void
+Lyric_combine_music_iterator::construct_children ()
{
- SCM l = get_music ()->get_property ("elements");
- if (!scm_is_pair (l))
- return 0;
- return unsmob_music (scm_car (l));
-}
+ Music *m = unsmob_music (get_music ()->get_property ("element"));
+ lyric_iter_ = unsmob_iterator (get_iterator (m));
-Music *
-Old_lyric_combine_music_iterator::get_combine_lyrics () const
-{
- SCM l = get_music ()->get_property ("elements");
- if (!scm_is_pair (l))
- return 0;
- l = scm_cdr (l);
- if (!scm_is_pair (l))
- return 0;
- return unsmob_music (scm_car (l));
-}
+ lyricsto_voice_name_ = get_music ()->get_property ("associated-context");
-void
-Old_lyric_combine_music_iterator::construct_children ()
-{
- music_iter_ = unsmob_iterator (get_iterator (get_combine_music ()));
- lyric_iter_ = unsmob_iterator (get_iterator (get_combine_lyrics ()));
+ find_voice ();
+
+ if (lyric_iter_)
+ lyrics_context_ = find_context_below (lyric_iter_->get_outlet (),
+ ly_symbol2scm ("Lyrics"), "");
+
+ /*
+ We do not create a Lyrics context, because the user might
+ create one with a different name, and then we will not find that
+ one.
+ */
}
-bool
-Old_lyric_combine_music_iterator::get_busy_status () const
+void
+Lyric_combine_music_iterator::find_voice ()
{
- /*
- We have to use both the event and the busyGrobs queue. The
- busyGrobs queue doesn't contain any notes that have started this
- instant. */
- if (try_music (busy_req))
- return true;
+ SCM voice_name = lyricsto_voice_name_;
+ SCM running = lyrics_context_
+ ? lyrics_context_->get_property ("associatedVoice")
+ : SCM_EOL;
- Context *tr = music_iter_->get_outlet ();
+ if (scm_is_string (running))
+ voice_name = running;
- SCM grobs = tr->get_property ("busyGrobs");
- Moment now = tr->now_mom ();
- for (; scm_is_pair (grobs); grobs = scm_cdr (grobs))
+ if (scm_is_string (voice_name)
+ && (!music_context_ || ly_scm2string (voice_name) != music_context_->id_string ()))
{
- SCM grob = scm_cdar (grobs);
- Moment end = *unsmob_moment (scm_caar (grobs));
-
/*
- This is slightly ugh: we are now confunding the frontend
- (iterators) and the backend (note heads) */
- if (end > now
- && Note_head::has_interface (unsmob_grob (grob)))
- return true;
- }
+ (spaghettini).
- return false;
-}
+ Need to set associatedVoiceContext again
+ */
+ if (music_context_)
+ made_association_ = false;
-bool
-Old_lyric_combine_music_iterator::melisma_busy ()
-{
- /* We cannot read the property, since music_iter_->get_outlet () might
- not be the context that sets the melisma properties, but rather a
- parent context. */
- return music_iter_->try_music (melisma_playing_req);
+ Context *t = get_outlet ();
+ while (t && t->get_parent_context ())
+ t = t->get_parent_context ();
+
+ string name = ly_scm2string (voice_name);
+ Context *voice = find_context_below (t, ly_symbol2scm ("Voice"), name);
+
+ if (voice)
+ music_context_ = voice;
+ }
+
+ if (lyrics_context_ && music_context_)
+ {
+ if (!made_association_)
+ {
+ made_association_ = true;
+ lyrics_context_->set_property ("associatedVoiceContext",
+ music_context_->self_scm ());
+ }
+ }
}
void
-Old_lyric_combine_music_iterator::process (Moment m)
+Lyric_combine_music_iterator::process (Moment mom)
{
- Moment my_next = music_iter_->pending_moment ();
- if (my_next > m)
+ (void) mom;
+ find_voice ();
+ if (!music_context_)
return;
- music_iter_->process (m);
+ if (!music_context_->get_parent_context ())
+ {
+ /*
+ The melody has died.
+ We die too.
+ */
+ if (lyrics_context_)
+ lyrics_context_->unset_property (ly_symbol2scm ("associatedVoiceContext"));
+ lyric_iter_ = 0;
+ music_context_ = 0;
+ }
- if (get_busy_status () && !melisma_busy () && lyric_iter_->ok ())
+ if (music_context_
+ && (start_new_syllable () || pending_grace_lyric_)
+ && lyric_iter_->ok ())
{
+ if (music_context_->now_mom ().grace_part_)
+ {
+ pending_grace_lyric_ = true;
+ return;
+ }
+ else
+ pending_grace_lyric_ = false;
+
Moment m = lyric_iter_->pending_moment ();
lyric_iter_->process (m);
+
+ music_found_ = true;
}
}
void
-Old_lyric_combine_music_iterator::do_quit ()
+Lyric_combine_music_iterator::do_quit ()
{
- if (music_iter_)
- music_iter_->quit ();
+ if (!music_found_)
+ {
+ SCM voice_name = get_music ()->get_property ("associated-context");
+
+ string name;
+ if (scm_is_string (voice_name))
+ name = ly_scm2string (voice_name);
+
+ get_music ()->origin ()->warning (_f ("cannot find Voice `%s'",
+ name.c_str ()) + "\n");
+ }
+
if (lyric_iter_)
lyric_iter_->quit ();
}
Music_iterator *
-Old_lyric_combine_music_iterator::try_music_in_children (Music *m) const
+Lyric_combine_music_iterator::try_music_in_children (Music *m) const
{
- Music_iterator *i = music_iter_->try_music (m);
- if (i)
- return i;
- else
- return lyric_iter_->try_music (m);
+ return lyric_iter_->try_music (m);
}
-IMPLEMENT_CTOR_CALLBACK (Old_lyric_combine_music_iterator);
+IMPLEMENT_CTOR_CALLBACK (Lyric_combine_music_iterator);
projects / lilypond.git / blobdiff