X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=455ab600eb0861ef37485174f169ae98387d877f;hb=5287c2ed78ed3d434d67651896902f23a9b52eb1;hp=435e312729ed365241da483aa725374fca0c64c1;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 435e312729..455ab600eb 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,86 +1,211 @@ /* - script-reg.cc -- implement Script_engraver + script-engraver.cc -- implement Script_engraver - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ -#include "script-engraver.hh" #include "script.hh" +#include "side-position-interface.hh" #include "musical-request.hh" #include "stem.hh" -#include "staff-sym.hh" -#include "general-script-def.hh" -#include "text-def.hh" +#include "rhythmic-head.hh" +#include "engraver.hh" +#include "note-column.hh" +class Script_engraver : public Engraver +{ + 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); +}; -Script_engraver::Script_engraver() +void +Script_engraver::initialize () { - do_post_move_processing(); + script_reqs_.clear (); } bool -Script_engraver::do_try_request (Request *r_l) +Script_engraver::try_music (Music *r) { - if (!r_l->access_Musical_req () || ! r_l->access_Musical_req ()->access_Musical_script_req ()) - return false ; - - for (int i=0; i < script_req_l_arr_.size(); i++) + if (Articulation_req *mr = dynamic_cast (r)) { - if (r_l->equal_b (script_req_l_arr_[i])) - return true; + for (int i=0; i < script_reqs_.size (); i++) + { + if (script_reqs_[i]->equal_b (mr)) + return true; + } + script_reqs_.push (mr); + return true; } - script_req_l_arr_.push (r_l->access_Script_req ()); - - return true; + return false; } void -Script_engraver::do_process_requests() +Script_engraver::process_music () { - if (script_p_arr_.size ()) - return ; - - for (int i=0; i < script_req_l_arr_.size(); i++) + for (int i=0; i < script_reqs_.size (); i++) { - Script_req* l=script_req_l_arr_[i]; - Script *p =new Script; - p->dir_ = l->dir_; - p->specs_p_ = l->scriptdef_p_->clone (); - script_p_arr_.push (p); - announce_element (Score_element_info (p, l)); + Articulation_req* l=script_reqs_[i]; + + SCM alist = get_property ("scriptDefinitions"); + SCM art = scm_assoc (l->get_mus_property ("articulation-type"), alist); + + if (art == SCM_BOOL_F) + { + 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; + } + // 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 s = p->get_grob_property ("script-priority"); + if (gh_number_p (s)) + priority = gh_scm2int (s); + + /* Make sure they're in order of user input by adding index i. */ + priority += i * (to_dir (force_dir) ? to_dir (force_dir) : 1); + + 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)); + + scripts_.push (p); + + announce_grob (p, l->self_scm()); } } void -Script_engraver::do_pre_move_processing() +Script_engraver::acknowledge_grob (Grob_info inf) { - Staff_symbol* s_l = get_staff_info().staff_sym_l_; - for (int i=0; i < script_p_arr_.size(); i++) + if (Stem::has_interface (inf.grob_)) + { + 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::has_interface (inf.grob_)) + { + for (int i=0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i]; + + 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 (Note_column::has_interface (inf.grob_)) { - Script*script_p = script_p_arr_[i]; - if (!script_p->specs_p_->inside_b()) - script_p->add_support (s_l); - if (script_p->specs_p_->is_type_b (Text_def::static_name ())) + /* + 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++) { - Text_def * td_l = (Text_def*)script_p->specs_p_; - Scalar style = get_property ("textstyle"); - if (style.to_bool ()) + Grob *e = scripts_[i]; + + if (!e->get_parent (X_AXIS) && + Side_position_interface::get_axis (e) == Y_AXIS) { - td_l->style_str_= style; + e->set_parent (inf.grob_, X_AXIS); } } - typeset_element (script_p); } - script_p_arr_.clear(); } void -Script_engraver::do_post_move_processing() +Script_engraver::stop_translation_timestep () { - script_req_l_arr_.clear(); + for (int i=0; i < scripts_.size (); 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); + } + scripts_.clear (); } +void +Script_engraver::start_translation_timestep () +{ + script_reqs_.clear (); +} + + + +Script_engraver::Script_engraver(){} -IMPLEMENT_IS_TYPE_B1(Script_engraver,Engraver); -ADD_THIS_TRANSLATOR(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 */ "");