X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=f460892c138124322ee6b6d3ea817b711a50caa7;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6baa67bfc05d8d20536fc4b18d88afe63499780d;hpb=a5dd8f857c7857aaa4acfbddf0c2c46088e69259;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 6baa67bfc0..f460892c13 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -3,25 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ +#include "engraver.hh" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" -#include "slur.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 { - Music *event_; + Stream_event *event_; Grob *script_; Script_tuple () { @@ -32,15 +37,13 @@ struct Script_tuple class Script_engraver : public Engraver { - Array scripts_; - Spanner *slur_; + vector scripts_; protected: - virtual bool try_music (Music *); void stop_translation_timestep (); void process_music (); - DECLARE_ACKNOWLEDGER (slur); + DECLARE_TRANSLATOR_LISTENER (articulation); DECLARE_ACKNOWLEDGER (rhythmic_head); DECLARE_ACKNOWLEDGER (stem); DECLARE_ACKNOWLEDGER (stem_tremolo); @@ -52,28 +55,23 @@ public: Script_engraver::Script_engraver () { - slur_ = 0; } -bool -Script_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Script_engraver, articulation); +void +Script_engraver::listen_articulation (Stream_event *ev) { - if (m->is_mus_type ("articulation-event")) - { - /* 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 (t); - return true; - } - return false; + /* 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); } void @@ -83,7 +81,7 @@ copy_property (Grob *g, SCM sym, SCM alist) { SCM entry = scm_assoc (sym, alist); if (scm_is_pair (entry)) - g->internal_set_property (sym, scm_cdr (entry)); + g->set_property (sym, scm_cdr (entry)); } } @@ -91,8 +89,9 @@ copy_property (Grob *g, SCM sym, SCM alist) 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) +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); @@ -100,7 +99,7 @@ void make_script_from_event (Grob *p, Context *tg, if (art == SCM_BOOL_F) { /* FIXME: */ - warning (_ ("don't know how to interpret articulation: ")); + warning (_ ("do not know how to interpret articulation: ")); warning (_ ("scheme encoding: ")); scm_write (art_type, scm_current_error_port ()); message (""); @@ -132,8 +131,9 @@ void make_script_from_event (Grob *p, Context *tg, } SCM preset = p->get_property_data (sym); - if (scm_call_1 (type, preset) == SCM_BOOL_F) - p->internal_set_property (sym, val); + if (val == SCM_EOL + || scm_call_1 (type, preset) == SCM_BOOL_F) + p->set_property (sym, val); } if (!priority_found) @@ -141,26 +141,24 @@ void make_script_from_event (Grob *p, Context *tg, p->set_property ("script-priority", scm_from_int (index)); } - - Side_position_interface::set_axis (p, Y_AXIS); } void Script_engraver::process_music () { - for (int i = 0; i < scripts_.size (); i++) + for (vsize i = 0; i < scripts_.size (); i++) { - Music *music = scripts_[i].event_; + Stream_event *ev = scripts_[i].event_; - Grob *p = make_item ("Script", music->self_scm ()); + Grob *p = make_item ("Script", ev->self_scm ()); make_script_from_event (p, context (), - music->get_property ("articulation-type"), + ev->get_property ("articulation-type"), i); scripts_[i].script_ = p; - SCM force_dir = music->get_property ("direction"); + SCM force_dir = ev->get_property ("direction"); if (is_direction (force_dir) && to_dir (force_dir)) p->set_property ("direction", force_dir); } @@ -196,9 +194,9 @@ Script_engraver::acknowledge_stem_tremolo (Grob_info info) void Script_engraver::acknowledge_rhythmic_head (Grob_info info) { - if (info.music_cause ()) + if (info.event_cause ()) { - for (int i = 0; i < scripts_.size (); i++) + for (vsize i = 0; i < scripts_.size (); i++) { Grob *e = scripts_[i].script_; @@ -221,7 +219,7 @@ Script_engraver::acknowledge_note_column (Grob_info info) As the note head to put it on is not known now, postpone this decision to Script_interface::calc_direction (). */ - for (int i = 0; i < scripts_.size (); i++) + for (vsize i = 0; i < scripts_.size (); i++) { Grob *e = scripts_[i].script_; @@ -231,29 +229,27 @@ Script_engraver::acknowledge_note_column (Grob_info info) } } -void -Script_engraver::acknowledge_slur (Grob_info info) -{ - slur_ = info.spanner (); -} - void Script_engraver::stop_translation_timestep () { scripts_.clear (); } -#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 */ ""); + /* doc */ + "Handle note scripted articulations.", + + /* create */ + "Script ", + + /* read */ + "scriptDefinitions ", + + /* write */ + "" + );