#include "side-position-interface.hh"
#include "musical-request.hh"
#include "stem.hh"
-#include "staff-symbol.hh"
#include "rhythmic-head.hh"
-#include "dimension-cache.hh"
-
#include "engraver.hh"
class Script_engraver : public Engraver {
- Link_array<Script> script_p_arr_;
+ Link_array<Grob> script_p_arr_;
Link_array<Articulation_req> script_req_l_arr_;
public:
Script_engraver();
protected:
- virtual bool do_try_music (Music*);
- virtual void do_process_music ();
- virtual void do_pre_move_processing ();
- virtual void do_post_move_processing ();
- virtual void acknowledge_element (Score_element_info);
+ virtual bool try_music (Music*);
+ void deprecated_process_music ();
+ virtual void stop_translation_timestep ();
+ virtual void start_translation_timestep ();
+ virtual void create_grobs ();
+ virtual void acknowledge_grob (Grob_info);
};
Script_engraver::Script_engraver()
{
- do_post_move_processing();
+ start_translation_timestep();
}
bool
-Script_engraver::do_try_music (Music *r_l)
+Script_engraver::try_music (Music *r_l)
{
if (Articulation_req *mr = dynamic_cast <Articulation_req *> (r_l))
{
}
void
-Script_engraver::do_process_music()
+Script_engraver::create_grobs ()
+{
+ deprecated_process_music ();
+}
+
+void
+Script_engraver::deprecated_process_music()
{
for (int i=0; i < script_req_l_arr_.size(); i++)
{
Articulation_req* l=script_req_l_arr_[i];
- SCM list = ly_eval_str (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C());
-
+ SCM alist = get_property ("scriptDefinitions");
+ SCM list = scm_assoc (l->get_mus_property ("articulation-type"), alist);
+
if (list == SCM_BOOL_F)
{
- l->warning (_f ("Don't know how to interpret articulation `%s'",
- l->articulation_str_.ch_C ()));
+ String a = ly_scm2string (l->get_mus_property ("articulation-type"));
+ l->origin ()->warning (_f ("Don't know how to interpret articulation `%s'", a.ch_C()));
+
continue;
}
- Script *p =new Script;
- Side_position_interface stafy (p);
-
-
+ // todo -> use result of articulation-to-scriptdef directly as basic prop list.
+ Grob *p =new Item (get_property ("Script"));
list = gh_cdr (list);
- p->set_elt_property ("molecule",
+ p->set_grob_property ("molecule",
gh_car (list));
list = gh_cdr(list);
bool follow_staff = gh_scm2bool (gh_car (list));
list = gh_cdr(list);
- int relative_stem_dir = gh_scm2int (gh_car (list));
+ SCM relative_stem_dir = gh_car (list);
list = gh_cdr(list);
- int force_dir =gh_scm2int (gh_car (list));
+
+ SCM force_dir = l->get_mus_property ("direction");
+ if (!isdir_b (force_dir))
+ force_dir = gh_car (list);
list = gh_cdr(list);
SCM priority = gh_car (list);
- if (relative_stem_dir)
- p->set_elt_property ("side-relative-direction", gh_int2scm (relative_stem_dir));
+ if (!isdir_b (force_dir)
+ && to_dir (relative_stem_dir))
+ p->set_grob_property ("side-relative-direction", relative_stem_dir);
else
- stafy.set_direction ((Direction)force_dir);
-
- if (l->get_direction ())
- stafy.set_direction (l->get_direction ());
+ p->set_grob_property ("direction", force_dir);
+ /*
+ FIXME: should figure this out in relation with basic props!
+ */
SCM axisprop = get_property ("scriptHorizontal");
bool xaxis = to_boolean (axisprop);
- if (xaxis)
- stafy.set_axis (X_AXIS);
- else
- stafy.set_axis (Y_AXIS);
+ Side_position::set_axis (p, xaxis ? X_AXIS : Y_AXIS);
if (!follow_staff && ! xaxis)
- p->set_elt_property ("staff-support", SCM_BOOL_T);
+ p->set_grob_property ("staff-support", SCM_BOOL_T);
if (!xaxis && follow_staff)
- stafy.set_quantised (Y_AXIS);
+ p->add_offset_callback (Side_position::quantised_position_proc, Y_AXIS);
- p->set_elt_property ("script-priority", priority);
+
+ p->set_grob_property ("script-priority", priority);
script_p_arr_.push (p);
- announce_element (Score_element_info (p, l));
+ announce_grob (p, l);
}
+ script_req_l_arr_.clear ();
}
void
-Script_engraver::acknowledge_element (Score_element_info inf)
+Script_engraver::acknowledge_grob (Grob_info inf)
{
- bool them_grace = to_boolean (inf.elem_l_->get_elt_property ("grace"));
+ bool them_grace = to_boolean (inf.elem_l_->get_grob_property ("grace"));
bool us_grace = to_boolean (get_property ("weAreGraceContext"));
if (us_grace != them_grace)
return;
- if (Stem *s = dynamic_cast<Stem*>(inf.elem_l_))
+ if (Stem::has_interface (inf.elem_l_))
{
for (int i=0; i < script_p_arr_.size(); i++)
{
- Side_position_interface stafy (script_p_arr_[i]);
- stafy.elt_l_->set_elt_property ("direction-source", s->self_scm_);
- stafy.add_support (s);
+ Grob*e = script_p_arr_[i];
+
+ e->set_grob_property ("direction-source", inf.elem_l_->self_scm ());
+ Side_position::add_support (e, inf.elem_l_);
}
}
- else if (Rhythmic_head * rh = dynamic_cast<Rhythmic_head*>(inf.elem_l_))
+ else if (Rhythmic_head::has_interface (inf.elem_l_))
{
for (int i=0; i < script_p_arr_.size(); i++)
{
- Side_position_interface stafy(script_p_arr_[i]);
+ Grob *e = script_p_arr_[i];
- if (!stafy.elt_l_->parent_l (X_AXIS))
+ if (!e->parent_l (X_AXIS))
{
- stafy.elt_l_->set_parent (inf.elem_l_, X_AXIS);
+ e->set_parent (inf.elem_l_, X_AXIS);
}
- if (stafy.get_axis () == X_AXIS
- && !stafy.elt_l_->parent_l (Y_AXIS))
- stafy.elt_l_->set_parent (rh, Y_AXIS);
+ if (Side_position::get_axis (e) == X_AXIS
+ && !e->parent_l (Y_AXIS))
+ e->set_parent (inf.elem_l_, Y_AXIS);
- stafy.add_support (rh);
+ Side_position::add_support (e,inf.elem_l_);
}
}
}
void
-Script_engraver::do_pre_move_processing()
+Script_engraver::stop_translation_timestep()
{
for (int i=0; i < script_p_arr_.size(); i++)
{
- if (to_boolean (script_p_arr_[i]->remove_elt_property ("staff-support")))
- side_position (script_p_arr_[i]).add_staff_support ();
- typeset_element (script_p_arr_[i]);
+ Grob * sc = script_p_arr_[i];
+ if (to_boolean (sc->get_grob_property ("staff-support")))
+ {
+ Side_position::add_staff_support (sc);
+ }
+ typeset_grob (sc);
}
script_p_arr_.clear();
}
void
-Script_engraver::do_post_move_processing()
+Script_engraver::start_translation_timestep()
{
script_req_l_arr_.clear();
}
projects / lilypond.git / blobdiff