/*
- slur-grav.cc -- implement Slur_engraver
+ slur-engraver.cc -- implement Slur_engraver
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "musical-request.hh"
-#include "slur-engraver.hh"
#include "slur.hh"
#include "debug.hh"
#include "note-column.hh"
{
Link_array<Span_req> requests_arr_;
Link_array<Span_req> new_slur_req_l_arr_;
- Link_array<Score_element> slur_l_stack_;
- Link_array<Score_element> end_slur_l_arr_;
+ Link_array<Grob> slur_l_stack_;
+ Link_array<Grob> end_slur_l_arr_;
Moment last_start_;
void set_melisma (bool);
protected:
- virtual bool do_try_music (Music*);
- virtual void do_process_music ();
- virtual void acknowledge_element (Score_element_info);
- virtual void do_pre_move_processing ();
- virtual void do_post_move_processing ();
- virtual void do_removal_processing ();
+ 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 create_grobs ();
public:
- VIRTUAL_COPY_CONS (Translator);
- Slur_engraver ();
+ TRANSLATOR_DECLARATIONS(Slur_engraver);
};
Slur_engraver::Slur_engraver ()
}
bool
-Slur_engraver::do_try_music (Music *req_l)
+Slur_engraver::try_music (Music *req_l)
{
if (Span_req *sl = dynamic_cast <Span_req *> (req_l))
{
- if (sl->span_type_str_ == "abort")
+ String t = ly_scm2string (sl->get_mus_property ("span-type"));
+ if (t == "abort")
{
for (int i = 0; i < slur_l_stack_.size (); i++)
{
requests_arr_.clear ();
new_slur_req_l_arr_.clear ();
}
- else if (sl->span_type_str_ == "slur")
+ else if (t == "slur")
{
/*
Let's not start more than one slur per moment.
*/
- if (sl->get_span_dir() == START)
+ if (sl->get_span_dir () == START)
{
if (now_mom () > last_start_)
{
}
void
-Slur_engraver::acknowledge_element (Score_element_info info)
+Slur_engraver::acknowledge_grob (Grob_info info)
{
- if (Note_column::has_interface (info.elem_l_))
+ if (Note_column::has_interface (info.grob_l_))
{
- Score_element *e =info.elem_l_;
+ Grob *e =info.grob_l_;
for (int i = 0; i < slur_l_stack_.size (); i++)
Slur::add_column (slur_l_stack_[i], e);
for (int i = 0; i < end_slur_l_arr_.size (); i++)
}
void
-Slur_engraver::do_removal_processing ()
+Slur_engraver::finalize ()
{
for (int i = 0; i < slur_l_stack_.size (); i++)
{
#if 0
- typeset_element (slur_l_stack_[i]);
+ typeset_grob (slur_l_stack_[i]);
#else
/*
Let's not typeset unterminated stuff
#endif
}
slur_l_stack_.clear ();
- SCM wg = get_property ("weAreGraceContext");
- bool wgb = to_boolean (wg);
- if (!wgb)
- for (int i=0; i < requests_arr_.size (); i++)
+
+ for (int i=0; i < requests_arr_.size (); i++)
{
requests_arr_[i]->origin ()->warning (_ ("unterminated slur"));
}
}
void
-Slur_engraver::do_process_music ()
+Slur_engraver::create_grobs ()
{
- Link_array<Score_element> start_slur_l_arr;
+ Link_array<Grob> start_slur_l_arr;
for (int i=0; i< new_slur_req_l_arr_.size (); i++)
{
Span_req* slur_req_l = new_slur_req_l_arr_[i];
// end slur: move the slur to other array
- if (slur_req_l->get_span_dir() == STOP)
+ if (slur_req_l->get_span_dir () == STOP)
{
if (slur_l_stack_.empty ())
+ /* How to shut up this warning, when Voice_devnull_engraver has
+ eaten start request? */
slur_req_l->origin ()->warning (_f ("can't find start of slur"));
else
{
- Score_element* slur = slur_l_stack_.pop ();
+ Grob* slur = slur_l_stack_.pop ();
SCM s = get_property ("slurEndAttachment");
if (gh_symbol_p (s))
{
- index_set_cell (slur->get_elt_property ("attachment"), STOP, s);
+ index_set_cell (slur->get_grob_property ("attachment"), STOP, s);
}
end_slur_l_arr_.push (slur);
requests_arr_.pop ();
}
}
- else if (slur_req_l->get_span_dir() == START)
+ else if (slur_req_l->get_span_dir () == START)
{
// push a new slur onto stack.
// (use temp. array to wait for all slur STOPs)
- Score_element* slur = new Spanner (get_property ("Slur"));
- Slur::set_interface (slur);
+ Grob* slur = new Spanner (get_property ("Slur"));
+ Slur::set_interface (slur); // cannot remove yet!
SCM s = get_property ("slurBeginAttachment");
if (gh_symbol_p (s))
{
- index_set_cell (slur->get_elt_property ("attachment"), START, s);
+ index_set_cell (slur->get_grob_property ("attachment"), START, s);
}
start_slur_l_arr.push (slur);
requests_arr_.push (slur_req_l);
- announce_element (slur, slur_req_l);
+ announce_grob(slur, slur_req_l->self_scm());
}
}
for (int i=0; i < start_slur_l_arr.size (); i++)
slur_l_stack_.push (start_slur_l_arr[i]);
+ new_slur_req_l_arr_.clear ();
}
void
-Slur_engraver::do_pre_move_processing ()
+Slur_engraver::stop_translation_timestep ()
{
for (int i = 0; i < end_slur_l_arr_.size (); i++)
{
- typeset_element (end_slur_l_arr_[i]);
+ typeset_grob (end_slur_l_arr_[i]);
}
end_slur_l_arr_.clear ();
}
void
-Slur_engraver::do_post_move_processing ()
+Slur_engraver::start_translation_timestep ()
{
new_slur_req_l_arr_.clear ();
SCM m = get_property ("automaticMelismata");
}
-ADD_THIS_TRANSLATOR (Slur_engraver);
+
+ENTER_DESCRIPTION(Slur_engraver,
+/* descr */ "Build slurs from Slur_reqs",
+/* creats*/ "Slur",
+/* acks */ "note-column-interface",
+/* reads */ "slurBeginAttachment slurEndAttachment slurMelismaBusy",
+/* write */ "");