/*
slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "musical-request.hh"
+#include "event.hh"
#include "slur.hh"
#include "warn.hh"
#include "note-column.hh"
*/
class Slur_engraver : public Engraver
{
- Link_array<Span_req> requests_;
- Link_array<Span_req> new_slur_reqs_;
+ Link_array<Music> events_;
+ Link_array<Music> new_slur_evs_;
Link_array<Grob> slur_stack_;
Link_array<Grob> end_slurs_;
Moment last_start_;
virtual bool try_music (Music*);
virtual void acknowledge_grob (Grob_info);
virtual void stop_translation_timestep ();
- virtual void start_translation_timestep ();
virtual void finalize ();
- virtual void process_acknowledged_grobs ();
+ virtual void process_music ();
public:
TRANSLATOR_DECLARATIONS (Slur_engraver);
}
bool
-Slur_engraver::try_music (Music *req)
+Slur_engraver::try_music (Music *ev)
{
- if (Span_req *sl = dynamic_cast <Span_req *> (req))
+ if (ev->is_mus_type ("slur-event"))
{
- String t = ly_scm2string (sl->get_mus_property ("span-type"));
- if (t == "abort")
+ /*
+ Let's not start more than one slur per moment.
+ */
+ Direction d = to_dir (ev->get_mus_property ("span-direction"));
+ if (d == START)
{
- for (int i = 0; i < slur_stack_.size (); i++)
- {
- slur_stack_[i]->suicide ();
- }
- slur_stack_.clear ();
- for (int i = 0; i < end_slurs_.size (); i++)
+ if (now_mom () > last_start_)
{
- end_slurs_[i]->suicide ();
+ new_slur_evs_.push (ev);
+ last_start_ = now_mom ();
}
- end_slurs_.clear ();
- requests_.clear ();
- new_slur_reqs_.clear ();
+
+ /*
+ But we swallow other slur events.
+ */
+
+ return true;
}
- else if (t == "slur")
+ else if (d == STOP)
{
/*
- Let's not start more than one slur per moment.
- */
- if (sl->get_span_dir () == START)
+ Swallow other events.
+ */
+ for (int j = new_slur_evs_.size(); j--;)
{
- if (now_mom () > last_start_)
- {
- new_slur_reqs_.push (sl);
- last_start_ = now_mom ();
- }
-
- /*
- But we swallow other slur requests.
- */
+ Direction nd = to_dir (new_slur_evs_[j]->get_mus_property ("span-direction"));
- return true;
-
+ if (nd == STOP)
+ return true;
}
- else if (sl->get_span_dir () == STOP)
- {
- /*
- Swallow other requests.
- */
- for (int j = new_slur_reqs_.size(); j--;)
- if (new_slur_reqs_[j]->get_span_dir() == STOP)
- return true;
- new_slur_reqs_.push (sl);
- return true;
- }
+ new_slur_evs_.push (ev);
+ return true;
}
}
return false;
{
for (int i = 0; i < slur_stack_.size (); i++)
{
-#if 0
- typeset_grob (slur_stack_[i]);
-#else
/*
Let's not typeset unterminated stuff
*/
slur_stack_[i]->suicide ();
-#endif
}
slur_stack_.clear ();
- for (int i=0; i < requests_.size (); i++)
+ for (int i=0; i < events_.size (); i++)
{
- requests_[i]->origin ()->warning (_ ("unterminated slur"));
+ events_[i]->origin ()->warning (_ ("unterminated slur"));
}
}
void
-Slur_engraver::process_acknowledged_grobs ()
+Slur_engraver::process_music ()
{
Link_array<Grob> start_slurs;
- for (int i=0; i< new_slur_reqs_.size (); i++)
+ for (int i=0; i< new_slur_evs_.size (); i++)
{
- Span_req* slur_req = new_slur_reqs_[i];
+ Music* slur_ev = new_slur_evs_[i];
// end slur: move the slur to other array
- if (slur_req->get_span_dir () == STOP)
+ Direction d = to_dir (slur_ev->get_mus_property ("span-direction"));
+ if (d== STOP)
{
if (slur_stack_.empty ())
/* How to shut up this warning, when Voice_devnull_engraver has
- eaten start request? */
- slur_req->origin ()->warning (_f ("can't find start of slur"));
+ eaten start event? */
+ slur_ev->origin ()->warning (_f ("can't find start of slur"));
else
{
Grob* slur = slur_stack_.pop ();
end_slurs_.push (slur);
- requests_.pop ();
+ events_.pop ();
}
}
- else if (slur_req->get_span_dir () == START)
+ else if (d == START)
{
// push a new slur onto stack.
// (use temp. array to wait for all slur STOPs)
- Grob* slur = new Spanner (get_property ("Slur"));
+ Grob* slur = make_spanner ("Slur");
Slur::set_interface (slur); // cannot remove yet!
+
+
+ if (Direction updown = to_dir (slur_ev->get_mus_property ("direction")))
+ {
+ slur->set_grob_property ("direction", gh_int2scm (updown));
+ }
+
start_slurs.push (slur);
- requests_.push (slur_req);
- announce_grob (slur, slur_req->self_scm ());
+ events_.push (slur_ev);
+ announce_grob (slur, slur_ev->self_scm ());
}
}
- for (int i=0; i < start_slurs.size (); i++)
- slur_stack_.push (start_slurs[i]);
- new_slur_reqs_.clear ();
+
+ slur_stack_.concat (start_slurs);
+
+ set_melisma (slur_stack_.size ());
+
+ new_slur_evs_.clear ();
}
void
typeset_grob (end_slurs_[i]);
}
end_slurs_.clear ();
-}
-
-void
-Slur_engraver::start_translation_timestep ()
-{
- new_slur_reqs_.clear ();
- SCM m = get_property ("automaticMelismata");
- if (to_boolean (m))
- {
- set_melisma (slur_stack_.size ());
- }
+ new_slur_evs_.clear ();
}
ENTER_DESCRIPTION (Slur_engraver,
-/* descr */ "Build slurs from Slur_reqs",
+/* descr */ "Build slurs from Slur_evs",
/* creats*/ "Slur",
-/* acks */ "note-column-interface",
+/* accepts */ "slur-event",
+/* acks */ "note-column-interface",
/* reads */ "slurMelismaBusy",
/* write */ "");
projects / lilypond.git / blobdiff