X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=3defd89c8d298c77dbc051320748097393f329d2;hb=ff3d20fcb28e7ccf0fa9ad242dc16afb9cf0f7ba;hp=e7511c557905ac8883b08e73c953707702fb5181;hpb=1b9fc29140bd1d9345f784595afd22158876dfb7;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index e7511c5579..3defd89c8d 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,22 +1,34 @@ /* script-engraver.cc -- implement Script_engraver - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ #include "script.hh" #include "side-position-interface.hh" -#include "request.hh" +#include "event.hh" #include "stem.hh" #include "rhythmic-head.hh" #include "engraver.hh" #include "note-column.hh" +#include "translator-group.hh" -class Script_engraver : public Engraver +struct Script_tuple { - Link_array scripts_; - Link_array script_reqs_; + 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: @@ -31,7 +43,7 @@ protected: void Script_engraver::initialize () { - script_reqs_.clear (); + scripts_.clear (); } bool @@ -39,82 +51,91 @@ Script_engraver::try_music (Music *r) { if (r->is_mus_type ("articulation-event")) { - script_reqs_.push (r); + Script_tuple t; + t.event_ =r; + scripts_.push (t); return true; } return false; } void -Script_engraver::process_music () +copy_property (Grob * g , SCM sym, SCM alist) { - for (int i=0; i < script_reqs_.size (); i++) + if (g->internal_get_grob_property (sym) == SCM_EOL) { - Music* 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) + SCM entry = scm_assoc (sym,alist); + if (gh_pair_p (entry)) { - 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; + g->internal_set_grob_property (sym, gh_cdr (entry)); } - // 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. - Don't use the direction in this priority. Smaller means closer - to the head. - */ - priority += i; +/* + 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_type= event->get_mus_property ("articulation-type"); + SCM art = scm_assoc (art_type, alist); - 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); + if (art == SCM_BOOL_F) + { + event->origin ()->warning (_("Don't know how to interpret articulation:")); + event->origin ()->warning (_("Scheme encoding: ")); + scm_write (art_type, scm_current_error_port ()); + return 0 ; + } + art = gh_cdr (art); + + Grob *p =new Item (tg->get_property ("Script")); + *descr = art; - /* - 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); + SCM force_dir = event->get_mus_property ("direction"); + if (is_direction (force_dir) && to_dir (force_dir)) + p->set_grob_property ("direction", force_dir); - if (!follow_staff && ! xaxis) - p->set_grob_property ("staff-support", SCM_BOOL_T); + copy_property (p, ly_symbol2scm ("script-molecule"), art); + copy_property (p, ly_symbol2scm ("direction"), art); + copy_property (p, ly_symbol2scm ("side-relative-direction"), art); - 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()); + 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()); } } @@ -125,9 +146,14 @@ Script_engraver::acknowledge_grob (Grob_info inf) { for (int i=0; i < scripts_.size (); i++) { - Grob*e = scripts_[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 ()); - 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_); } @@ -136,7 +162,7 @@ Script_engraver::acknowledge_grob (Grob_info inf) { for (int i=0; i < scripts_.size (); i++) { - Grob *e = scripts_[i]; + Grob *e = scripts_[i].script_; if (Side_position_interface::get_axis (e) == X_AXIS && !e->get_parent (Y_AXIS)) @@ -160,7 +186,7 @@ Script_engraver::acknowledge_grob (Grob_info inf) */ for (int i=0; i < scripts_.size (); i++) { - Grob *e = scripts_[i]; + Grob *e = scripts_[i].script_; if (!e->get_parent (X_AXIS) && Side_position_interface::get_axis (e) == Y_AXIS) @@ -176,15 +202,16 @@ Script_engraver::stop_translation_timestep () { for (int i=0; i < scripts_.size (); i++) { + if (!scripts_[i].script_) + continue; + + Grob * sc = scripts_[i].script_; - /* - TODO: junk staff-support. - */ - Grob * sc = scripts_[i]; - if (to_boolean (sc->get_grob_property ("staff-support"))) - { - Side_position_interface::add_staff_support (sc); - } + 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); } scripts_.clear (); @@ -193,7 +220,7 @@ Script_engraver::stop_translation_timestep () void Script_engraver::start_translation_timestep () { - script_reqs_.clear (); + scripts_.clear (); } @@ -201,10 +228,9 @@ Script_engraver::start_translation_timestep () Script_engraver::Script_engraver(){} ENTER_DESCRIPTION(Script_engraver, -/* descr */ " Handles note ornaments generated by @code{\\script}. -", +/* descr */ "Handles note scripted articulations.", /* creats*/ "Script", /* accepts */ "script-event articulation-event", /* acks */ "stem-interface rhythmic-head-interface note-column-interface", -/* reads */ "scriptDefinitions scriptHorizontal", +/* reads */ "scriptDefinitions", /* write */ "");