X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscript-engraver.cc;h=1e989ae55d7800aee0e3e5ba7b5e52ab229c3cb6;hb=0e7e2c235053fbe9d631fda4094c9c077defad62;hp=b8e93c6cd00aa193a509acd7264e12f9e623fa3a;hpb=16e71c11296fe1291636907b77c32be93d3b4e7c;p=lilypond.git diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index b8e93c6cd0..1e989ae55d 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,278 +1,304 @@ /* - script-engraver.cc -- engrave Scripts: Articulations. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ +#include "engraver.hh" + #include "context.hh" #include "directional-element-interface.hh" -#include "engraver.hh" -#include "event.hh" -#include "new-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_; - SCM description_; Script_tuple () { event_ = 0; script_ = 0; - description_ = SCM_EOL; } }; class Script_engraver : public Engraver { - Array scripts_; - Spanner *slur_; + vector scripts_; protected: - virtual bool try_music (Music*); - virtual void stop_translation_timestep (); - virtual void process_music (); - virtual void acknowledge_grob (Grob_info); + void stop_translation_timestep (); + void process_music (); + + void listen_articulation (Stream_event *); + void acknowledge_rhythmic_head (Grob_info); + void acknowledge_stem (Grob_info); + void acknowledge_stem_tremolo (Grob_info); + void acknowledge_tie (Grob_info); + void acknowledge_end_tie (Grob_info); + void acknowledge_note_column (Grob_info); + void acknowledge_inline_accidental (Grob_info); public: TRANSLATOR_DECLARATIONS (Script_engraver); }; -Script_engraver::Script_engraver () +Script_engraver::Script_engraver (Context *c) + : Engraver (c) { - slur_ = 0; } -bool -Script_engraver::try_music (Music *m) +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_c_equal_p (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. */ + for (vsize i = 0; i < scripts_.size (); 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 copy_property (Grob *g, SCM sym, SCM alist) { - if (g->internal_get_property (sym) == SCM_EOL) + if (scm_is_null (g->get_property (sym))) { SCM entry = scm_assoc (sym, alist); - if (ly_c_pair_p (entry)) - g->internal_set_property (sym, ly_cdr (entry)); + if (scm_is_pair (entry)) + g->set_property (sym, scm_cdr (entry)); } } -/* Add the properties, one by one for each Script. A little space - (memory? --jcn) could be saved by tacking the props onto the Script - grob (i.e. make ScriptStaccato , ScriptMarcato, etc. ). */ -void make_script_from_event (Grob *p, SCM *descr, Context *tg, - SCM art_type, int index) +/* 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 (scm_is_false (art)) { /* FIXME: */ - warning (_ ("Do not know how to interpret articulation: ")); - warning (_ ("Scheme encoding: ")); + warning (_ ("do not know how to interpret articulation:")); + warning (_ (" scheme encoding: ")); scm_write (art_type, scm_current_error_port ()); + message (""); return; } - art = ly_cdr (art); - *descr = art; - - copy_property (p, ly_symbol2scm ("script-stencil"), art); - copy_property (p, ly_symbol2scm ("direction"), art); - copy_property (p, ly_symbol2scm ("side-relative-direction"), art); + art = scm_cdr (art); - int prio = 0; - SCM sprio = scm_assoc (ly_symbol2scm ("script-priority"), art); - if (ly_c_pair_p (sprio)) - prio = ly_scm2int (ly_cdr (sprio)); + bool priority_found = false; - /* 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; + 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 (scm_is_eq (sym, ly_symbol2scm ("script-priority"))) + { + 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 (scm_is_null (val) + || scm_is_false (scm_call_1 (type, preset))) + p->set_property (sym, val); + } - Side_position_interface::set_axis (p, Y_AXIS); - p->set_property ("script-priority", scm_int2num (prio)); + if (!priority_found) + { + p->set_property ("script-priority", + scm_from_int (index)); + } } void Script_engraver::process_music () { - int script_count = scripts_.size (); - for (int i = 0; i < script_count; i++) + for (vsize i = 0; i < scripts_.size (); i++) { - Music *m = scripts_[i].event_; + Stream_event *ev = scripts_[i].event_; - Grob *p = make_item ("Script", m->self_scm ()); + Grob *p = make_item ("Script", ev->self_scm ()); - make_script_from_event (p, &scripts_[i].description_, context (), - m->get_property ("articulation-type"), - i); + make_script_from_event (p, context (), + ev->get_property ("articulation-type"), + i); scripts_[i].script_ = p; - SCM force_dir = m->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); + p->set_property ("direction", force_dir); + } +} + +void +Script_engraver::acknowledge_stem (Grob_info info) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + 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) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); } } void -Script_engraver::acknowledge_grob (Grob_info info) +Script_engraver::acknowledge_tie (Grob_info info) { - int script_count = scripts_.size (); - if (Stem::has_interface (info.grob_)) + for (vsize i = 0; i < scripts_.size (); i++) { - for (int i = 0; i < script_count; i++) - { - Grob *e = scripts_[i].script_; + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} - if (to_dir (e->get_property ("side-relative-direction"))) - e->set_property ("direction-source", info.grob_->self_scm ()); +void +Script_engraver::acknowledge_end_tie (Grob_info info) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); + } +} - /* FIXME: add dependency */ - e->add_dependency (info.grob_); - Side_position_interface::add_support (e, info.grob_); - } +void +Script_engraver::acknowledge_inline_accidental (Grob_info info) +{ + for (vsize i = 0; i < scripts_.size (); i++) + { + Grob *e = scripts_[i].script_; + Side_position_interface::add_support (e, info.grob ()); } - else if (Rhythmic_head::has_interface (info.grob_)) +} + +void +Script_engraver::acknowledge_rhythmic_head (Grob_info info) +{ + if (info.event_cause ()) { - for (int i = 0; i < script_count; i++) - { - Grob *e = scripts_[i].script_; - - if (Side_position_interface::get_axis (e) == X_AXIS - && !e->get_parent (Y_AXIS)) - { - e->set_parent (info.grob_, Y_AXIS); - e->add_dependency (info.grob_); - } - Side_position_interface::add_support (e,info.grob_); - } + 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 (info.grob (), Y_AXIS); + } + Side_position_interface::add_support (e, info.grob ()); + } } - else if (Note_column::has_interface (info.grob_)) +} + +void +Script_engraver::acknowledge_note_column (Grob_info info) +{ + /* 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++) { - /* 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::before_line_breaking (). */ - for (int i = 0; i < script_count; 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); - } + 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); } - else if (New_slur::has_interface (info.grob_)) - slur_ = dynamic_cast (info.grob_); } void Script_engraver::stop_translation_timestep () { - int script_count = scripts_.size (); - for (int i = 0; i < script_count; i++) - if (Grob *sc = scripts_[i].script_) - { - SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), - scripts_[i].description_); - if (ly_c_pair_p (follow) && to_boolean (ly_cdr (follow))) - { - sc->add_offset_callback (Side_position_interface - ::quantised_position_proc, Y_AXIS); - sc->set_property ("staff-padding", SCM_EOL); - } - - /* Simplistic slur collision handling. This fixes simple collisions - like - - a_\upbow( b) - - but it most probably breaks for more interesting cases. - Maybe make a new colission engraver. - - - Assume that a SCRIPT that should collide with SLUR does not - have a negative priority. */ - SCM priority = sc->get_property ("script-priority"); - -#if 0 - // this segfaults... - int rank = Paper_column::get_rank (sc); -#endif - - int rank = -1; -#if 1 - // this always yields -1 - if (Item *i = dynamic_cast (sc)) - if (i->get_column ()) - rank = i->get_column ()->rank_; -#else - // this always yields -1 - for (Grob *p = sc; p && rank < 0; p = p->get_parent (Y_AXIS)) - { - if (Item *i = dynamic_cast (p)) - if (i->get_column ()) - rank = i->get_column ()->rank_; - } -#endif - - if (robust_scm2int (priority, 0) >= 0 - && slur_ - && get_grob_direction (sc) == get_slur_dir (slur_) - && (slur_->spanned_rank_iv ().contains (rank) - /* I'm a bit out of ideas about and time to search for - how to get our rank. Sue me. */ - || rank == -1)) - { - Real ss = Staff_symbol_referencer::staff_space (sc); - Real pad = robust_scm2double (sc->get_property ("padding"), 0); - - /* FIXME: 1ss padding hardcoded */ - sc->set_property ("padding", scm_make_real (pad + ss)); - } - } scripts_.clear (); } -ENTER_DESCRIPTION (Script_engraver, -/* descr */ "Handles note scripted articulations.", -/* creats*/ "Script", -/* accepts */ "script-event articulation-event", -/* acks */ "stem-interface rhythmic-head-interface\ - new-slur-interface note-column-interface", -/* reads */ "scriptDefinitions", -/* write */ ""); + +void +Script_engraver::boot () +{ + ADD_LISTENER (Script_engraver, articulation); + ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head); + ADD_ACKNOWLEDGER (Script_engraver, stem); + ADD_ACKNOWLEDGER (Script_engraver, tie); + ADD_END_ACKNOWLEDGER (Script_engraver, tie); + ADD_ACKNOWLEDGER (Script_engraver, note_column); + ADD_ACKNOWLEDGER (Script_engraver, stem_tremolo); + ADD_ACKNOWLEDGER (Script_engraver, inline_accidental); +} + +ADD_TRANSLATOR (Script_engraver, + /* doc */ + "Handle note scripted articulations.", + + /* create */ + "Script ", + + /* read */ + "scriptDefinitions ", + + /* write */ + "" + );