X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Fscript-engraver.cc;h=455ab600eb0861ef37485174f169ae98387d877f;hb=5287c2ed78ed3d434d67651896902f23a9b52eb1;hp=ae2dfa312e94d391637f6b7105c0eefb0d7ac057;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index ae2dfa312e..455ab600eb 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,157 +1,211 @@ /* script-engraver.cc -- implement Script_engraver - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ -#include "script-engraver.hh" #include "script.hh" -#include "stem-staff-side.hh" +#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" +#include "note-column.hh" -Script_engraver::Script_engraver() +class Script_engraver : public Engraver { - do_post_move_processing(); + Link_array scripts_; + Link_array script_reqs_; + +public: + TRANSLATOR_DECLARATIONS(Script_engraver); +protected: + virtual bool try_music (Music*); + virtual void initialize (); + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void process_music (); + virtual void acknowledge_grob (Grob_info); +}; + +void +Script_engraver::initialize () +{ + script_reqs_.clear (); } bool -Script_engraver::do_try_music (Music *r_l) +Script_engraver::try_music (Music *r) { - if (Articulation_req *mr = dynamic_cast (r_l)) + if (Articulation_req *mr = dynamic_cast (r)) { - for (int i=0; i < script_req_l_arr_.size(); i++) + for (int i=0; i < script_reqs_.size (); i++) { - if (script_req_l_arr_[i]->equal_b (mr)) + if (script_reqs_[i]->equal_b (mr)) return true; } - script_req_l_arr_.push (mr); + script_reqs_.push (mr); return true; } return false; } void -Script_engraver::do_process_requests() +Script_engraver::process_music () { - for (int i=0; i < script_req_l_arr_.size(); i++) + for (int i=0; i < script_reqs_.size (); i++) { - Articulation_req* l=script_req_l_arr_[i]; + Articulation_req* l=script_reqs_[i]; - SCM list = ly_ch_C_eval_scm (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C()); - - if (list == SCM_BOOL_F) + SCM alist = get_property ("scriptDefinitions"); + SCM art = scm_assoc (l->get_mus_property ("articulation-type"), alist); + + if (art == 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.to_str0 ())); + continue; } - Script *p =new Script; - Stem_staff_side_item * ss =new Stem_staff_side_item; - list = SCM_CDR (list); - - p->set_elt_property (molecule_scm_sym, - SCM_CAR(list)); - - list = SCM_CDR(list); - bool follow_staff = gh_scm2bool (SCM_CAR(list)); - list = SCM_CDR(list); - int relative_stem_dir = gh_scm2int (SCM_CAR(list)); - list = SCM_CDR(list); - int force_dir =gh_scm2int (SCM_CAR(list)); - list = SCM_CDR(list); - SCM priority = SCM_CAR(list); - - if (relative_stem_dir) - ss->relative_dir_ = (Direction)relative_stem_dir; - else - ss->dir_ = (Direction)force_dir; - - SCM dir_prop (get_property ("articulationScriptVerticalDirection", 0)); - if (SCM_NUMBERP(dir_prop)) - ss->dir_ = to_dir (dir_prop); - - if (l->dir_) - ss->dir_ = l->dir_; - - SCM paddingprop = get_property ("articulationScriptPadding", 0); - if (SCM_NUMBERP(paddingprop)) - { - ss->set_elt_property (padding_scm_sym, paddingprop); - } + // todo -> use result of articulation-to-scriptdef directly as basic prop list. + Grob *p =new Item (get_property ("Script")); + art = ly_cdr (art); + p->set_grob_property ("script-molecule", ly_car (art)); + + art = ly_cdr (art); + bool follow_staff = gh_scm2bool (ly_car (art)); + art = ly_cdr (art); + SCM relative_stem_dir = ly_car (art); + art = ly_cdr (art); + + SCM force_dir = l->get_mus_property ("direction"); + if (ly_dir_p (force_dir) && !to_dir (force_dir)) + force_dir = ly_car (art); + + art = ly_cdr (art); + int priority = gh_scm2int (ly_car (art)); - SCM axisprop = get_property ("scriptHorizontal",0); - if (gh_boolean_p (axisprop) && gh_scm2bool (axisprop)) - ss->axis_ = X_AXIS; + SCM s = p->get_grob_property ("script-priority"); + if (gh_number_p (s)) + priority = gh_scm2int (s); - if (follow_staff && !gh_boolean_p (axisprop) && gh_scm2bool (axisprop)) - ss->set_elt_property (no_staff_support_scm_sym, SCM_BOOL_T); + /* Make sure they're in order of user input by adding index i. */ + priority += i * (to_dir (force_dir) ? to_dir (force_dir) : 1); - p->set_staff_side (ss); - ss->set_elt_property (script_priority_scm_sym, priority); - if (SCM_NUMBERP (paddingprop)) - ss->set_elt_property (padding_scm_sym, paddingprop); - + if (ly_dir_p (force_dir) && to_dir (force_dir)) + p->set_grob_property ("direction", force_dir); + else if (to_dir (relative_stem_dir)) + p->set_grob_property ("side-relative-direction", relative_stem_dir); + + + /* + FIXME: should figure this out in relation with basic props! + */ + SCM axisprop = get_property ("scriptHorizontal"); + bool xaxis = to_boolean (axisprop); + Side_position_interface::set_axis (p, xaxis ? X_AXIS : Y_AXIS); + + if (!follow_staff && ! xaxis) + p->set_grob_property ("staff-support", SCM_BOOL_T); + + if (!xaxis && follow_staff) + p->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS); + + + p->set_grob_property ("script-priority", gh_int2scm (priority)); - script_p_arr_.push (p); - staff_side_p_arr_.push (ss); + scripts_.push (p); - announce_element (Score_element_info (p, l)); - announce_element (Score_element_info (ss, l)); + announce_grob (p, l->self_scm()); } } void -Script_engraver::acknowledge_element (Score_element_info inf) +Script_engraver::acknowledge_grob (Grob_info inf) { - if (Stem *s = dynamic_cast(inf.elem_l_)) + if (Stem::has_interface (inf.grob_)) { - for (int i=0; i < staff_side_p_arr_.size(); i++) - if (Stem_staff_side_item * ss = dynamic_cast(staff_side_p_arr_[i])) - { - ss->set_stem (s); - ss->add_support (s); - } + for (int i=0; i < scripts_.size (); i++) + { + Grob*e = scripts_[i]; + + e->set_grob_property ("direction-source", inf.grob_->self_scm ()); + e->add_dependency (inf.grob_); + Side_position_interface::add_support (e, inf.grob_); + } } - else if (Rhythmic_head * rh = dynamic_cast(inf.elem_l_)) + else if (Rhythmic_head::has_interface (inf.grob_)) { - for (int i=0; i < staff_side_p_arr_.size(); i++) + for (int i=0; i < scripts_.size (); i++) { - Staff_side_item * ss = dynamic_cast(staff_side_p_arr_[i]); + Grob *e = scripts_[i]; - if (!ss->parent_l (X_AXIS)) + if (Side_position_interface::get_axis (e) == X_AXIS + && !e->get_parent (Y_AXIS)) { - ss->set_parent (inf.elem_l_, X_AXIS); + e->set_parent (inf.grob_, Y_AXIS); + e->add_dependency (inf.grob_); // ?? } - if (ss->axis_ == X_AXIS - && !ss->parent_l (Y_AXIS)) - ss->set_parent (rh, Y_AXIS); + Side_position_interface::add_support (e,inf.grob_); + } + } + else if (Note_column::has_interface (inf.grob_)) + { + + /* + We make note column the parent of the script. That's not + correct, but due to seconds in a chord, noteheads may be + swapped around horizontally. We don't know which note head to + put it on, so we postpone this decision to + Script_interface::before_line_breaking (). + + */ + for (int i=0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i]; - ss->add_support (rh); + if (!e->get_parent (X_AXIS) && + Side_position_interface::get_axis (e) == Y_AXIS) + { + e->set_parent (inf.grob_, X_AXIS); + } } - } + } } void -Script_engraver::do_pre_move_processing() +Script_engraver::stop_translation_timestep () { - for (int i=0; i < script_p_arr_.size(); i++) + for (int i=0; i < scripts_.size (); i++) { - typeset_element (script_p_arr_[i]); - typeset_element (staff_side_p_arr_[i]); + + /* + TODO: junk staff-support. + */ + Grob * sc = scripts_[i]; + if (to_boolean (sc->get_grob_property ("staff-support"))) + { + Side_position_interface::add_staff_support (sc); + } + typeset_grob (sc); } - script_p_arr_.clear(); - staff_side_p_arr_.clear (); + scripts_.clear (); } void -Script_engraver::do_post_move_processing() +Script_engraver::start_translation_timestep () { - script_req_l_arr_.clear(); + script_reqs_.clear (); } -ADD_THIS_TRANSLATOR(Script_engraver); + +Script_engraver::Script_engraver(){} + +ENTER_DESCRIPTION(Script_engraver, +/* descr */ " Handles note ornaments generated by @code{\\script}. +", +/* creats*/ "Script", +/* acks */ "stem-interface rhythmic-head-interface note-column-interface", +/* reads */ "scriptDefinitions scriptHorizontal", +/* write */ "");