X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=f460892c138124322ee6b6d3ea817b711a50caa7;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=009ee8a978ab39dc567bc91182030712d6419db4;hpb=487ee28c2a58e7bd5cb9e85c7676057c0b32f385;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 009ee8a978..f460892c13 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,210 +1,255 @@ /* - script-engraver.cc -- implement Script_engraver + script-engraver.cc -- engrave Scripts: Articulations. - (c) 1997--2002 Han-Wen Nienhuys + source file of the GNU LilyPond music typesetter + + (c) 1997--2008 Han-Wen Nienhuys */ -#include "script.hh" -#include "side-position-interface.hh" -#include "event.hh" -#include "stem.hh" -#include "rhythmic-head.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 "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 { - Link_array scripts_; - Link_array script_reqs_; + vector 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 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::initialize () +Script_engraver::listen_articulation (Stream_event *ev) { - script_reqs_.clear (); + /* 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::try_music (Music *r) +void +copy_property (Grob *g, SCM sym, SCM alist) { - if (r->is_mus_type ("articulation-event")) + if (g->internal_get_property (sym) == SCM_EOL) { - script_reqs_.push (r); - 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::process_music () +make_script_from_event (Grob *p, Context *tg, + SCM art_type, int index) { - for (int i=0; i < script_reqs_.size (); i++) + SCM alist = tg->get_property ("scriptDefinitions"); + SCM art = scm_assoc (art_type, alist); + + if (art == SCM_BOOL_F) + { + /* 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); + + bool priority_found = false; + + for (SCM s = art; scm_is_pair (s); s = scm_cdr (s)) { - Music* l=script_reqs_[i]; + SCM sym = scm_caar (s); + SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?")); + if (!ly_is_procedure (type)) + continue; - SCM alist = get_property ("scriptDefinitions"); - SCM art = scm_assoc (l->get_mus_property ("articulation-type"), alist); + SCM val = scm_cdar (s); - if (art == SCM_BOOL_F) + 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.to_str0 ())); - - 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 = 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; - - 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()); + + SCM preset = p->get_property_data (sym); + if (val == SCM_EOL + || scm_call_1 (type, preset) == SCM_BOOL_F) + p->set_property (sym, val); + } + + if (!priority_found) + { + p->set_property ("script-priority", + scm_from_int (index)); } } void -Script_engraver::acknowledge_grob (Grob_info inf) +Script_engraver::process_music () { - if (Stem::has_interface (inf.grob_)) + for (vsize i = 0; i < scripts_.size (); i++) { - for (int i=0; i < scripts_.size (); i++) - { - Grob*e = scripts_[i]; + Stream_event *ev = scripts_[i].event_; - e->set_grob_property ("direction-source", inf.grob_->self_scm ()); - e->add_dependency (inf.grob_); - Side_position_interface::add_support (e, inf.grob_); - } + 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::has_interface (inf.grob_)) +} + +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 < 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_); - } + 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 ()); } - else if (Note_column::has_interface (inf.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_; - /* - 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++) - { - Grob *e = scripts_[i]; - - if (!e->get_parent (X_AXIS) && - Side_position_interface::get_axis (e) == Y_AXIS) + if (Side_position_interface::get_axis (e) == X_AXIS + && !e->get_parent (Y_AXIS)) { - e->set_parent (inf.grob_, X_AXIS); + e->set_parent (info.grob (), Y_AXIS); } + 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 < scripts_.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 *e = 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); - } - typeset_grob (sc); + if (!e->get_parent (X_AXIS) + && Side_position_interface::get_axis (e) == Y_AXIS) + e->set_parent (info.grob (), X_AXIS); } - scripts_.clear (); } void -Script_engraver::start_translation_timestep () +Script_engraver::stop_translation_timestep () { - script_reqs_.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 ", -Script_engraver::Script_engraver(){} + /* read */ + "scriptDefinitions ", -ENTER_DESCRIPTION(Script_engraver, -/* descr */ " Handles note ornaments generated by @code{\\script}. -", -/* creats*/ "Script", -/* accepts */ "script-event articulation-event", -/* acks */ "stem-interface rhythmic-head-interface note-column-interface", -/* reads */ "scriptDefinitions scriptHorizontal", -/* write */ ""); + /* write */ + "" + );