X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=9a06474c6b21731f51ab5337e778e7da325f1029;hb=cd586e589daa7a550fa39200a78cb2012e853d99;hp=af30403cf1d190e73637681b73a3775db350ad82;hpb=89bf299597169eeaa5ed7a215b6e808fa849c8cd;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index af30403cf1..9a06474c6b 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,182 +1,262 @@ /* - script-engraver.cc -- implement Script_engraver + script-engraver.cc -- engrave Scripts: Articulations. - (c) 1997--2000 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2006 Han-Wen Nienhuys */ +#include "engraver.hh" -#include "script.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 "script-interface.hh" #include "side-position-interface.hh" -#include "musical-request.hh" +#include "slur.hh" +#include "staff-symbol-referencer.hh" #include "stem.hh" -#include "rhythmic-head.hh" -#include "engraver.hh" +#include "warn.hh" -class Script_engraver : public Engraver { - Link_array script_p_arr_; - Link_array script_req_l_arr_; +struct Script_tuple +{ + Music *event_; + Grob *script_; + Script_tuple () + { + event_ = 0; + script_ = 0; + } +}; -public: - VIRTUAL_COPY_CONS (Translator); +class Script_engraver : public Engraver +{ + vector scripts_; + Spanner *slur_; protected: - virtual bool try_music (Music*); - virtual void initialize (); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void create_grobs (); - virtual void acknowledge_grob (Grob_info); -}; + virtual bool try_music (Music *); + void stop_translation_timestep (); + void process_music (); + DECLARE_ACKNOWLEDGER (slur); + DECLARE_ACKNOWLEDGER (rhythmic_head); + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (stem_tremolo); + DECLARE_ACKNOWLEDGER (note_column); -void -Script_engraver::initialize () +public: + TRANSLATOR_DECLARATIONS (Script_engraver); +}; + +Script_engraver::Script_engraver () { - script_req_l_arr_.clear(); + slur_ = 0; } bool -Script_engraver::try_music (Music *r_l) +Script_engraver::try_music (Music *m) { - if (Articulation_req *mr = dynamic_cast (r_l)) + if (m->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); + /* 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"), + m->get_property ("articulation-type"))) + return true; + + Script_tuple t; + t.event_ = m; + scripts_.push_back (t); return true; } return false; } void -Script_engraver::create_grobs () +copy_property (Grob *g, SCM sym, SCM alist) { - for (int i=0; i < script_req_l_arr_.size(); i++) + if (g->internal_get_property (sym) == SCM_EOL) { - Articulation_req* l=script_req_l_arr_[i]; + SCM entry = scm_assoc (sym, alist); + if (scm_is_pair (entry)) + g->internal_set_property (sym, scm_cdr (entry)); + } +} - SCM alist = get_property ("scriptDefinitions"); - SCM art = scm_assoc (l->get_mus_property ("articulation-type"), alist); +/* 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 make_script_from_event (Grob *p, Context *tg, + SCM art_type, int index) +{ + SCM alist = tg->get_property ("scriptDefinitions"); + SCM art = scm_assoc (art_type, alist); - if (art == SCM_BOOL_F) + if (art == SCM_BOOL_F) + { + /* FIXME: */ + warning (_ ("don't know how to interpret articulation: ")); + warning (_ ("scheme encoding: ")); + scm_write (art_type, scm_current_error_port ()); + message (""); + return; + } + + art = scm_cdr (art); + + 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")) { - 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; + 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); } - // todo -> use result of articulation-to-scriptdef directly as basic prop list. - Grob *p =new Item (get_property ("Script")); - art = gh_cdr (art); - p->set_grob_property ("molecule", - gh_car (art)); - - art = gh_cdr(art); - bool follow_staff = gh_scm2bool (gh_car (art)); - art = gh_cdr(art); - SCM relative_stem_dir = gh_car (art); - art = gh_cdr(art); - - SCM force_dir = l->get_mus_property ("direction"); - if (isdir_b (force_dir) && to_dir (force_dir)) - force_dir = gh_car (art); - - art = gh_cdr(art); - SCM priority = gh_car (art); - - - if (isdir_b (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::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::quantised_position_proc, Y_AXIS); - - - p->set_grob_property ("script-priority", priority); - - script_p_arr_.push (p); - - announce_grob (p, l); + + SCM preset = p->get_property_data (sym); + if (val == SCM_EOL + || scm_call_1 (type, preset) == SCM_BOOL_F) + p->internal_set_property (sym, val); } - script_req_l_arr_.clear (); + + if (!priority_found) + { + p->set_property ("script-priority", + scm_from_int (index)); + } + + Side_position_interface::set_axis (p, Y_AXIS); } void -Script_engraver::acknowledge_grob (Grob_info inf) +Script_engraver::process_music () { - bool them_grace = to_boolean (inf.elem_l_->get_grob_property ("grace")); - bool us_grace = to_boolean (get_property ("weAreGraceContext")); + for (vsize i = 0; i < scripts_.size (); i++) + { + Music *music = scripts_[i].event_; + + Grob *p = make_item ("Script", music->self_scm ()); + + make_script_from_event (p, context (), + music->get_property ("articulation-type"), + i); - if (us_grace != them_grace) - return; - - if (Stem::has_interface (inf.elem_l_)) + scripts_[i].script_ = p; + + SCM force_dir = music->get_property ("direction"); + if (is_direction (force_dir) && to_dir (force_dir)) + p->set_property ("direction", force_dir); + } +} + +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 < script_p_arr_.size(); i++) - { - Grob*e = script_p_arr_[i]; + Grob *e = scripts_[i].script_; - e->set_grob_property ("direction-source", inf.elem_l_->self_scm ()); - Side_position::add_support (e, inf.elem_l_); - } + 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 ()); } - else if (Rhythmic_head::has_interface (inf.elem_l_)) +} + +void +Script_engraver::acknowledge_stem_tremolo (Grob_info info) +{ + int script_count = scripts_.size (); + for (int i = 0; i < script_count; i++) { - for (int i=0; i < script_p_arr_.size(); i++) - { - Grob *e = script_p_arr_[i]; - - if (!e->parent_l (X_AXIS)) + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} + + +void +Script_engraver::acknowledge_rhythmic_head (Grob_info info) +{ + if (info.music_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)) { - e->set_parent (inf.elem_l_, X_AXIS); + e->set_parent (info.grob (), Y_AXIS); } - if (Side_position::get_axis (e) == X_AXIS - && !e->parent_l (Y_AXIS)) - e->set_parent (inf.elem_l_, Y_AXIS); - - Side_position::add_support (e,inf.elem_l_); + Side_position_interface::add_support (e, info.grob ()); } - } + } } void -Script_engraver::stop_translation_timestep() +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++) { - Grob * sc = script_p_arr_[i]; - if (to_boolean (sc->get_grob_property ("staff-support"))) - { - Side_position::add_staff_support (sc); - } - typeset_grob (sc); + 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(); } void -Script_engraver::start_translation_timestep() +Script_engraver::acknowledge_slur (Grob_info info) +{ + slur_ = info.spanner (); +} + +void +Script_engraver::stop_translation_timestep () { - script_req_l_arr_.clear(); + scripts_.clear (); } -ADD_THIS_TRANSLATOR (Script_engraver); +#include "translator.icc" +ADD_ACKNOWLEDGER (Script_engraver, slur); +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 */ "Handles note scripted articulations.", + /* create */ "Script", + /* accept */ "script-event articulation-event", + /* read */ "scriptDefinitions", + /* write */ "");