/*
phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "musical-request.hh"
+#include "event.hh"
#include "slur.hh"
#include "warn.hh"
#include "note-column.hh"
#include "engraver.hh"
#include "spanner.hh"
+/*
+ TODO:
+
+ ALGRGRRGRG
+
+ Derive this from Slur_engraver. This code is completely duplicate.
+*/
class Phrasing_slur_engraver : public Engraver
{
- Link_array<Span_req> requestses_;
- Link_array<Span_req> new_phrasing_slur_reqs_;
+ Link_array<Music> eventses_;
+ Link_array<Music> new_phrasing_slur_evs_;
Link_array<Grob> phrasing_slur_l_stack_;
Link_array<Grob> end_phrasing_slurs_;
Moment last_start_;
}
bool
-Phrasing_slur_engraver::try_music (Music *req)
+Phrasing_slur_engraver::try_music (Music *ev)
{
- if (Span_req *sl = dynamic_cast <Span_req *> (req))
+ if (ev->is_mus_type ("abort-event"))
{
- String t = ly_scm2string (sl->get_mus_property ("span-type"));
- if (t == "abort")
+ for (int i = 0; i < phrasing_slur_l_stack_.size (); i++)
{
- for (int i = 0; i < phrasing_slur_l_stack_.size (); i++)
- {
- phrasing_slur_l_stack_[i]->suicide ();
- }
- phrasing_slur_l_stack_.clear ();
- for (int i = 0; i < end_phrasing_slurs_.size (); i++)
- {
- end_phrasing_slurs_[i]->suicide ();
- }
- end_phrasing_slurs_.clear ();
- requestses_.clear ();
- new_phrasing_slur_reqs_.clear ();
+ phrasing_slur_l_stack_[i]->suicide ();
}
- else if (t == "phrasing-slur")
+ phrasing_slur_l_stack_.clear ();
+ for (int i = 0; i < end_phrasing_slurs_.size (); i++)
{
- /*
- Let's not start more than one phrasing slur per moment.
- */
- if (sl->get_span_dir () == START)
- {
- if (now_mom () > last_start_)
- {
- new_phrasing_slur_reqs_.push (sl);
- last_start_ = now_mom ();
- return true;
- }
- }
- else
+ end_phrasing_slurs_[i]->suicide ();
+ }
+ end_phrasing_slurs_.clear ();
+ eventses_.clear ();
+ new_phrasing_slur_evs_.clear ();
+ }
+ else if (ev->is_mus_type ("phrasing-slur-event"))
+ {
+ /*
+ Let's not start more than one phrasing slur per moment.
+ */
+
+ Direction d = to_dir (ev->get_mus_property ("span-direction"));
+
+ if (d == START)
+ {
+ if (now_mom () > last_start_)
{
- new_phrasing_slur_reqs_.push (sl);
+ new_phrasing_slur_evs_.push (ev);
+ last_start_ = now_mom ();
return true;
}
}
+ else
+ {
+ new_phrasing_slur_evs_.push (ev);
+ return true;
+ }
}
return false;
}
#else
/*
Let's not typeset unterminated stuff
- */
+ */
phrasing_slur_l_stack_[i]->suicide ();
#endif
}
phrasing_slur_l_stack_.clear ();
- for (int i=0; i < requestses_.size (); i++)
- {
- requestses_[i]->origin ()->warning (_ ("unterminated phrasing slur"));
- }
+ for (int i=0; i < eventses_.size (); i++)
+ {
+ eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur"));
+ }
}
void
Phrasing_slur_engraver::process_acknowledged_grobs ()
{
Link_array<Grob> start_phrasing_slurs;
- for (int i=0; i< new_phrasing_slur_reqs_.size (); i++)
+ for (int i=0; i< new_phrasing_slur_evs_.size (); i++)
{
- Span_req* phrasing_slur_req = new_phrasing_slur_reqs_[i];
+ Music* phrasing_slur_ev = new_phrasing_slur_evs_[i];
// end phrasing slur: move the phrasing slur to other array
- if (phrasing_slur_req->get_span_dir () == STOP)
+
+ Direction d = to_dir (phrasing_slur_ev->get_mus_property ("span-direction"));
+
+ if (d == STOP)
{
if (phrasing_slur_l_stack_.empty ())
- phrasing_slur_req->origin ()->warning (_f ("can't find start of phrasing slur"));
+ phrasing_slur_ev->origin ()->warning (_f ("can't find start of phrasing slur"));
else
{
Grob* phrasing_slur = phrasing_slur_l_stack_.pop ();
end_phrasing_slurs_.push (phrasing_slur);
- requestses_.pop ();
+ eventses_.pop ();
}
}
- else if (phrasing_slur_req->get_span_dir () == START)
+ else if (d == START)
{
// push a new phrasing_slur onto stack.
// (use temp. array to wait for all phrasing_slur STOPs)
Grob* phrasing_slur = new Spanner (get_property ("PhrasingSlur"));
Slur::set_interface (phrasing_slur); // can't remove.
+
+
+ if (Direction updown = to_dir (phrasing_slur_ev->get_mus_property ("direction")))
+ {
+ phrasing_slur->set_grob_property ("direction", gh_int2scm (updown));
+ }
+
start_phrasing_slurs.push (phrasing_slur);
- requestses_.push (phrasing_slur_req);
- announce_grob(phrasing_slur, phrasing_slur_req->self_scm());
+ eventses_.push (phrasing_slur_ev);
+ announce_grob(phrasing_slur, phrasing_slur_ev->self_scm());
}
}
for (int i=0; i < start_phrasing_slurs.size (); i++)
phrasing_slur_l_stack_.push (start_phrasing_slurs[i]);
- new_phrasing_slur_reqs_.clear ();
+ new_phrasing_slur_evs_.clear ();
}
void
void
Phrasing_slur_engraver::start_translation_timestep ()
{
- new_phrasing_slur_reqs_.clear ();
+ new_phrasing_slur_evs_.clear ();
}
ENTER_DESCRIPTION(Phrasing_slur_engraver,
-/* descr */ "Print phrasing slurs. Similar to Slur_engraver",
+/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
/* creats*/ "PhrasingSlur",
+/* accepts */ "phrasing-slur-event",
/* acks */ "note-column-interface",
-/* reads */ "slurMelismaBusy",
+/* reads */ "",
/* write */ "");