X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=e7511c557905ac8883b08e73c953707702fb5181;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e8e2e8dd8564b119962bb872597814bba5abcefc;hpb=07d4d05df6479d58c3c5152c07d7c86b94ee98b4;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index e8e2e8dd85..f460892c13 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,156 +1,255 @@ /* - script-engraver.cc -- implement Script_engraver + script-engraver.cc -- engrave Scripts: Articulations. - (c) 1997--1999 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2008 Han-Wen Nienhuys */ -#include "script-engraver.hh" -#include "script.hh" -#include "stem-staff-side.hh" -#include "musical-request.hh" -#include "stem.hh" -#include "staff-symbol.hh" +#include "engraver.hh" + +#include "context.hh" +#include "directional-element-interface.hh" +#include "international.hh" +#include "note-column.hh" +#include "paper-column.hh" #include "rhythmic-head.hh" -#include "dimension-cache.hh" +#include "script-interface.hh" +#include "side-position-interface.hh" +#include "slur.hh" +#include "staff-symbol-referencer.hh" +#include "stem.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" + +struct Script_tuple +{ + Stream_event *event_; + Grob *script_; + Script_tuple () + { + event_ = 0; + script_ = 0; + } +}; + +class Script_engraver : public Engraver +{ + vector scripts_; -Script_engraver::Script_engraver() +protected: + void stop_translation_timestep (); + void process_music (); + + DECLARE_TRANSLATOR_LISTENER (articulation); + DECLARE_ACKNOWLEDGER (rhythmic_head); + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (note_column); + +public: + TRANSLATOR_DECLARATIONS (Script_engraver); +}; + +Script_engraver::Script_engraver () +{ +} + +IMPLEMENT_TRANSLATOR_LISTENER (Script_engraver, articulation); +void +Script_engraver::listen_articulation (Stream_event *ev) { - do_post_move_processing(); + /* Discard double articulations for part-combining. */ + int script_count = scripts_.size (); + for (int i = 0; i < script_count; i++) + if (ly_is_equal (scripts_[i].event_ + ->get_property ("articulation-type"), + ev->get_property ("articulation-type"))) + return; + + Script_tuple t; + t.event_ = ev; + scripts_.push_back (t); } -bool -Script_engraver::do_try_music (Music *r_l) +void +copy_property (Grob *g, SCM sym, SCM alist) { - if (Articulation_req *mr = dynamic_cast (r_l)) + if (g->internal_get_property (sym) == SCM_EOL) { - 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); - return true; + SCM entry = scm_assoc (sym, alist); + if (scm_is_pair (entry)) + g->set_property (sym, scm_cdr (entry)); } - return false; } +/* Add the properties, one by one for each Script. A little memory + could be saved by tacking the props onto the Script grob (i.e. make + ScriptStaccato , ScriptMarcato, etc. ). +*/ void -Script_engraver::do_process_requests() +make_script_from_event (Grob *p, Context *tg, + SCM art_type, int index) { - for (int i=0; i < script_req_l_arr_.size(); i++) + SCM alist = tg->get_property ("scriptDefinitions"); + SCM art = scm_assoc (art_type, alist); + + if (art == SCM_BOOL_F) { - Articulation_req* l=script_req_l_arr_[i]; + /* FIXME: */ + warning (_ ("do not know how to interpret articulation: ")); + warning (_ ("scheme encoding: ")); + scm_write (art_type, scm_current_error_port ()); + message (""); + return; + } + art = scm_cdr (art); - SCM list = ly_ch_C_eval_scm (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C()); - - if (list == SCM_BOOL_F) - { - l->warning(_f("don't know how to interpret articulation `%s'\n", - l->articulation_str_.ch_C())); - 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; - - Scalar dir_prop (get_property ("articulationScriptVerticalDirection", 0)); - if (dir_prop.isnum_b () && (int) dir_prop != CENTER) - ss->dir_ = (Direction)(int)dir_prop; - - if (l->dir_) - ss->dir_ = l->dir_; - - Real padding = 0.0; - Scalar paddingprop = get_property ("articulationScriptPadding", 0); - if (paddingprop.length_i() && paddingprop.isnum_b ()) + bool priority_found = false; + + for (SCM s = art; scm_is_pair (s); s = scm_cdr (s)) + { + SCM sym = scm_caar (s); + SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?")); + if (!ly_is_procedure (type)) + continue; + + SCM val = scm_cdar (s); + + if (sym == ly_symbol2scm ("script-priority")) { - padding = (Real)paddingprop; + priority_found = true; + /* 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. */ + int prio = scm_to_int (val) + index; + + val = scm_from_int (prio); } + SCM preset = p->get_property_data (sym); + if (val == SCM_EOL + || scm_call_1 (type, preset) == SCM_BOOL_F) + p->set_property (sym, val); + } - Scalar axisprop = get_property ("scriptHorizontal",0); - if (axisprop.to_bool ()) - ss->axis_ = X_AXIS; - - if (follow_staff && !axisprop.to_bool ()) - 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)); + if (!priority_found) + { + p->set_property ("script-priority", + scm_from_int (index)); } } void -Script_engraver::acknowledge_element (Score_element_info inf) +Script_engraver::process_music () { - if (Stem *s = dynamic_cast(inf.elem_l_)) + for (vsize i = 0; i < scripts_.size (); i++) { - 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); - } + Stream_event *ev = scripts_[i].event_; + + Grob *p = make_item ("Script", ev->self_scm ()); + + make_script_from_event (p, context (), + ev->get_property ("articulation-type"), + i); + + scripts_[i].script_ = p; + + SCM force_dir = ev->get_property ("direction"); + if (is_direction (force_dir) && to_dir (force_dir)) + p->set_property ("direction", force_dir); } - else if (Rhythmic_head * rh = dynamic_cast(inf.elem_l_)) +} + +void +Script_engraver::acknowledge_stem (Grob_info info) +{ + int script_count = scripts_.size (); + for (int i = 0; i < script_count; i++) { - for (int i=0; i < staff_side_p_arr_.size(); i++) - { - Staff_side_item * ss = dynamic_cast(staff_side_p_arr_[i]); - - if (!ss->parent_l (X_AXIS)) + Grob *e = scripts_[i].script_; + + if (to_dir (e->get_property ("side-relative-direction"))) + e->set_object ("direction-source", info.grob ()->self_scm ()); + + Side_position_interface::add_support (e, info.grob ()); + } +} + +void +Script_engraver::acknowledge_stem_tremolo (Grob_info info) +{ + int script_count = scripts_.size (); + for (int i = 0; i < script_count; i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} + + +void +Script_engraver::acknowledge_rhythmic_head (Grob_info info) +{ + if (info.event_cause ()) + { + for (vsize 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)) { - ss->set_parent (inf.elem_l_, X_AXIS); + e->set_parent (info.grob (), Y_AXIS); } - ss->add_support (rh); + Side_position_interface::add_support (e, info.grob ()); } - } + } } void -Script_engraver::do_pre_move_processing() +Script_engraver::acknowledge_note_column (Grob_info info) { - for (int i=0; i < script_p_arr_.size(); i++) + /* Make note column the parent of the script. That is not + correct, but due to seconds in a chord, noteheads may be + swapped around horizontally. + + As the note head to put it on is not known now, postpone this + decision to Script_interface::calc_direction (). */ + for (vsize i = 0; i < scripts_.size (); i++) { - typeset_element (script_p_arr_[i]); - typeset_element (staff_side_p_arr_[i]); + Grob *e = scripts_[i].script_; + + if (!e->get_parent (X_AXIS) + && Side_position_interface::get_axis (e) == Y_AXIS) + e->set_parent (info.grob (), X_AXIS); } - script_p_arr_.clear(); - staff_side_p_arr_.clear (); } void -Script_engraver::do_post_move_processing() +Script_engraver::stop_translation_timestep () { - script_req_l_arr_.clear(); + scripts_.clear (); } +ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head); +ADD_ACKNOWLEDGER (Script_engraver, stem); +ADD_ACKNOWLEDGER (Script_engraver, note_column); +ADD_ACKNOWLEDGER (Script_engraver, stem_tremolo); + +ADD_TRANSLATOR (Script_engraver, + /* doc */ + "Handle note scripted articulations.", + /* create */ + "Script ", -ADD_THIS_TRANSLATOR(Script_engraver); + /* read */ + "scriptDefinitions ", + /* write */ + "" + );