X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=74df559d3bd7145f3e94c7f7b205df8c40b153e5;hb=4f7187ac9efe404e0c5653fde88ebe972340e9c6;hp=66fcda01662b2d11006e09c52099a295a0e7df35;hpb=61c4b07cddc6231c3ca4b45a0aa86d27e25110b9;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 66fcda0166..74df559d3b 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,150 +1,234 @@ /* script-engraver.cc -- implement Script_engraver - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ -#include "script-engraver.hh" #include "script.hh" -#include "stem-staff-side.hh" -#include "musical-request.hh" +#include "side-position-interface.hh" +#include "event.hh" #include "stem.hh" -#include "staff-symbol.hh" #include "rhythmic-head.hh" -#include "dimension-cache.hh" +#include "engraver.hh" +#include "note-column.hh" +#include "translator-group.hh" -Script_engraver::Script_engraver() +struct Script_tuple { - do_post_move_processing(); + Music *event_; + Grob * script_; + SCM description_; + Script_tuple () + { + event_ = 0; + script_ = 0; + description_ = SCM_EOL; + } +}; + +class Script_engraver : public Engraver +{ + Array scripts_; +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 () +{ + scripts_.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 (r->is_mus_type ("articulation-event")) { - for (int i=0; i < script_req_l_arr_.size(); i++) - { - if (script_req_l_arr_[i]->equal_b (mr)) - return true; - } - script_req_l_arr_.push (mr); + Script_tuple t; + t.event_ =r; + scripts_.push (t); return true; } return false; } void -Script_engraver::do_process_requests() +copy_property (Grob * g , SCM sym, SCM alist) { - for (int i=0; i < script_req_l_arr_.size(); i++) + if (g->internal_get_grob_property (sym) == SCM_EOL) { - Articulation_req* l=script_req_l_arr_[i]; - - - SCM list = gh_eval_str (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C()); - - if (list == SCM_BOOL_F) + SCM entry = scm_assoc (sym,alist); + if (gh_pair_p (entry)) { - l->warning(_f("don't know how to interpret articulation `%s'\n", - l->articulation_str_.ch_C())); - continue; + g->internal_set_grob_property (sym, gh_cdr (entry)); } - 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_ = relative_stem_dir; - else - ss->dir_ = force_dir; + } +} - Scalar dir_prop (get_property ("articulationScriptVerticalDirection", 0)); - if (dir_prop.isnum_b () && (int) dir_prop != CENTER) - ss->dir_ = (int) dir_prop; - if (l->dir_) - ss->dir_ = l->dir_; +/* + We add the properties, one by one for each Script. We could save a + little space by tacking the props onto the Script grob (i.e. make + ScriptStaccato , ScriptMarcato, etc. ) + */ +Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event, + int index) +{ + SCM alist = tg->get_property ("scriptDefinitions"); + SCM art = scm_assoc (event->get_mus_property ("articulation-type"), alist); - Real padding = 0.0; - Scalar paddingprop = get_property ("articulationScriptPadding", 0); - if (paddingprop.length_i() && paddingprop.isnum_b ()) - { - padding = (Real)paddingprop; - } + if (art == SCM_BOOL_F) + { + String a = ly_scm2string (event->get_mus_property ("articulation-type")); + event->origin ()->warning (_f ("Don't know how to interpret articulation `%s'", a.to_str0 ())); + return 0 ; + } - if (follow_staff) - ss->set_elt_property (no_staff_support_scm_sym, SCM_BOOL_T); - p->set_staff_side (ss); - ss->set_elt_property (script_priority_scm_sym, priority); - if (padding) - ss->set_elt_property (padding_scm_sym, gh_double2scm(padding)); - script_p_arr_.push (p); - staff_side_p_arr_.push (ss); - - announce_element (Score_element_info (p, l)); - announce_element (Score_element_info (ss, l)); + art = gh_cdr (art); + + Grob *p =new Item (tg->get_property ("Script")); + *descr = art; + + SCM force_dir = event->get_mus_property ("direction"); + if (ly_dir_p (force_dir) && to_dir (force_dir)) + p->set_grob_property ("direction", force_dir); + + copy_property (p, ly_symbol2scm ("script-molecule"), art); + copy_property (p, ly_symbol2scm ("direction"), art); + copy_property (p, ly_symbol2scm ("side-relative-direction"), art); + + int prio =0; + SCM sprio = scm_assoc (ly_symbol2scm ("script-priority"), art); + if (gh_pair_p (sprio)) + prio = gh_scm2int (gh_cdr (sprio)); + + + /* + Make sure they're in order of user input by adding index i. + Don't use the direction in this priority. Smaller means closer + to the head. + */ + prio += index; + + Side_position_interface::set_axis (p, Y_AXIS); + p->set_grob_property ("script-priority", gh_int2scm (prio)); + return p; +} + +void +Script_engraver::process_music () +{ + for (int i=0; i < scripts_.size (); i++) + { + Music* l=scripts_[i].event_; + + Grob * p = make_script_from_event (&scripts_[i].description_, daddy_trans_, l, i); + + scripts_[i].script_ = p; + if (p) + 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 < scripts_.size (); i++) + { + Grob*e = scripts_[i].script_; + + if (to_dir (e->get_grob_property ("side-relative-direction"))) + e->set_grob_property ("direction-source", inf.grob_->self_scm ()); + + /* + add dep ? + */ + e->add_dependency (inf.grob_); + Side_position_interface::add_support (e, inf.grob_); + } + } + else if (Rhythmic_head::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].script_; + + if (Side_position_interface::get_axis (e) == X_AXIS + && !e->get_parent (Y_AXIS)) + { + e->set_parent (inf.grob_, Y_AXIS); + 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 (Note_column::has_interface (inf.grob_)) { - for (int i=0; i < staff_side_p_arr_.size(); i++) + + /* + 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++) { - Staff_side_item * ss = dynamic_cast(staff_side_p_arr_[i]); + Grob *e = scripts_[i].script_; - if (!ss->dim_cache_[X_AXIS]->parent_l_) + if (!e->get_parent (X_AXIS) && + Side_position_interface::get_axis (e) == Y_AXIS) { - ss->dim_cache_[X_AXIS]->parent_l_ = inf.elem_l_->dim_cache_[X_AXIS]; + e->set_parent (inf.grob_, X_AXIS); } - ss->add_support (rh); } - } + } } 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]); + if (!scripts_[i].script_) + continue; + + Grob * sc = scripts_[i].script_; + + SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), scripts_[i].description_); + if (gh_pair_p (follow) && to_boolean (gh_cdr (follow))) + sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS); + else + 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(); + scripts_.clear (); } -ADD_THIS_TRANSLATOR(Script_engraver); +Script_engraver::Script_engraver(){} +ENTER_DESCRIPTION(Script_engraver, +/* descr */ "Handles note scripted articulations.", +/* creats*/ "Script", +/* accepts */ "script-event articulation-event", +/* acks */ "stem-interface rhythmic-head-interface note-column-interface", +/* reads */ "scriptDefinitions", +/* write */ "");