X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=8a178f02b0d8849202b48db9659c667f79c7156b;hb=9bea477a992947adbbba48bc479c3f551cde8225;hp=d38939cd6ad38be8cdd92e6023de92eaa1129297;hpb=a4d7106c75b325441063fd9ba9c4131979784aa5;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index d38939cd6a..8a178f02b0 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,196 +3,186 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys - */ + (c) 1997--2005 Han-Wen Nienhuys +*/ -#include "key-item.hh" -#include "command-request.hh" -#include "musical-request.hh" #include "item.hh" -#include "bar.hh" -#include "timing-translator.hh" +#include "bar-line.hh" #include "staff-symbol-referencer.hh" -#include "translator-group.hh" +#include "context.hh" #include "engraver.hh" -#include "pitch.hh" #include "protected-scm.hh" #include "clef.hh" +/* + TODO: The representation of key sigs is all fucked. +*/ + /** - Make the key signature. - */ + Make the key signature. +*/ class Key_engraver : public Engraver { - void create_key(bool); - void read_req (Key_change_req const * r); + void create_key (bool); + void read_ev (Music const *r); + Music *key_ev_; + Item *item_; + Item *cancellation_; public: - Key_engraver(); - - VIRTUAL_COPY_CONS(Translator); - - Key_change_req * keyreq_l_; - Item * item_p_; - Protected_scm old_accs_; // ugh. -> property - + TRANSLATOR_DECLARATIONS (Key_engraver); + protected: - virtual void do_creation_processing(); - virtual void do_removal_processing (); - virtual bool do_try_music (Music *req_l); - void deprecated_process_music(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - virtual void process_acknowledged (); - virtual void acknowledge_element (Score_element_info); + virtual void initialize (); + virtual void finalize (); + virtual bool try_music (Music *ev); + virtual void stop_translation_timestep (); + virtual void start_translation_timestep (); + virtual void process_music (); + virtual void acknowledge_grob (Grob_info); }; - void -Key_engraver::do_removal_processing () +Key_engraver::finalize () { - old_accs_ = SCM_EOL; // unprotect can not be called from dtor. } Key_engraver::Key_engraver () { - keyreq_l_ = 0; - item_p_ = 0; + key_ev_ = 0; + item_ = 0; + cancellation_ = 0; } void Key_engraver::create_key (bool def) { - if (!item_p_) + if (!item_) { - item_p_ = new Item (get_property ("KeySignature")); + item_ = make_item ("KeySignature", key_ev_ ? key_ev_->self_scm () : SCM_EOL); - item_p_->set_elt_property ("c0-position", gh_int2scm (0)); + item_->set_property ("c0-position", + get_property ("middleCPosition")); - // todo: put this in basic props. - item_p_->set_elt_property ("old-accidentals", old_accs_); - item_p_->set_elt_property ("new-accidentals", get_property ("keySignature")); - - Staff_symbol_referencer::set_interface (item_p_); - Key_item::set_interface (item_p_); - - SCM prop = get_property ("keyOctaviation"); - bool multi = to_boolean (prop); - - if (multi) - item_p_->set_elt_property ("multi-octave", gh_bool2scm (multi)); - - announce_element (item_p_,keyreq_l_); + SCM last = get_property ("lastKeySignature"); + SCM key = get_property ("keySignature"); + if (to_boolean (get_property ("printKeyCancellation")) + && !scm_is_eq (last, key)) + { + cancellation_ = make_item ("KeyCancellation", key_ev_ ? key_ev_->self_scm () : SCM_EOL); + cancellation_->set_property ("old-accidentals", last); + cancellation_->set_property ("c0-position", + get_property ("middleCPosition")); + } + item_->set_property ("new-accidentals", key); } - if (!def) { - SCM vis = get_property ("explicitKeySignatureVisibility"); - if (gh_procedure_p (vis)) - item_p_->set_elt_property ("visibility-lambda",vis); + SCM vis = get_property ("explicitKeySignatureVisibility"); + if (ly_c_procedure_p (vis)) + item_->set_property ("break-visibility", vis); } -} - +} bool -Key_engraver::do_try_music (Music * req_l) +Key_engraver::try_music (Music *ev) { - if (Key_change_req *kc = dynamic_cast (req_l)) + if (ev->is_mus_type ("key-change-event")) { - if (keyreq_l_) - warning (_ ("FIXME: key change merge")); - keyreq_l_ = kc; - read_req (keyreq_l_); + /* do this only once, just to be on the safe side. */ + if (!key_ev_) + { + key_ev_ = ev; + read_ev (key_ev_); + } return true; - } - return false; + } + return false; } void -Key_engraver::acknowledge_element (Score_element_info info) +Key_engraver::acknowledge_grob (Grob_info info) { - if (Clef::has_interface (info.elem_l_)) + if (Clef::has_interface (info.grob_)) { - SCM c = get_property ("createKeyOnClefChange"); + SCM c = get_property ("createKeyOnClefChange"); if (to_boolean (c)) { create_key (false); } } - else if (Bar::has_interface (info.elem_l_) - && gh_pair_p (get_property ("keySignature"))) + else if (Bar_line::has_interface (info.grob_) + && scm_is_pair (get_property ("keySignature"))) { create_key (true); } - } void -Key_engraver::process_acknowledged () +Key_engraver::process_music () { - deprecated_process_music (); + if (key_ev_ + || get_property ("lastKeySignature") != get_property ("keySignature")) + create_key (false); } void -Key_engraver::deprecated_process_music () +Key_engraver::stop_translation_timestep () { - if (keyreq_l_ || old_accs_ != get_property ("keySignature")) - { - create_key (false); - } + item_ = 0; + context ()->set_property ("lastKeySignature", get_property ("keySignature")); + cancellation_ = 0; } void -Key_engraver::do_pre_move_processing () -{ - if (item_p_) - { - typeset_element (item_p_); - item_p_ = 0; - } -} - -void -Key_engraver::read_req (Key_change_req const * r) +Key_engraver::read_ev (Music const *r) { - SCM p = r->get_mus_property ("pitch-alist"); - if (!gh_pair_p (p)) + SCM p = r->get_property ("pitch-alist"); + if (!scm_is_pair (p)) return; SCM n = scm_list_copy (p); SCM accs = SCM_EOL; for (SCM s = get_property ("keyAccidentalOrder"); - gh_pair_p (s); s = gh_cdr (s)) + scm_is_pair (s); s = scm_cdr (s)) { - if (gh_pair_p (scm_member (gh_car (s), n))) + if (scm_is_pair (scm_member (scm_car (s), n))) { - accs = gh_cons (gh_car (s), accs); - n = scm_delete_x (gh_car (s), n); + accs = scm_cons (scm_car (s), accs); + n = scm_delete_x (scm_car (s), n); } } - for (SCM s = n ; gh_pair_p (s); s = gh_cdr (s)) - if (gh_scm2int (gh_cdar (s))) - accs = gh_cons (gh_car (s), accs); - old_accs_ = get_property ("keySignature"); - daddy_trans_l_->set_property ("keySignature", accs); + for (SCM s = n; scm_is_pair (s); s = scm_cdr (s)) + if (scm_to_int (scm_cdar (s))) + accs = scm_cons (scm_car (s), accs); + + context ()->set_property ("keySignature", accs); + context ()->set_property ("tonic", + r->get_property ("tonic")); } void -Key_engraver::do_post_move_processing () +Key_engraver::start_translation_timestep () { - keyreq_l_ = 0; - old_accs_ = get_property ("keySignature"); + key_ev_ = 0; } void -Key_engraver::do_creation_processing () +Key_engraver::initialize () { - daddy_trans_l_->set_property ("keySignature", SCM_EOL); - old_accs_ = SCM_EOL; -} - + context ()->set_property ("keySignature", SCM_EOL); + context ()->set_property ("lastKeySignature", SCM_EOL); -ADD_THIS_TRANSLATOR (Key_engraver); + Pitch p (0, 0, 0); + context ()->set_property ("tonic", p.smobbed_copy ()); +} +ADD_TRANSLATOR (Key_engraver, + /* descr */ "", + /* creats*/ "KeySignature", + /* accepts */ "key-change-event", + /* acks */ "bar-line-interface clef-interface", + /* reads */ "keySignature printKeyCancellation lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature", + /* write */ "lastKeySignature tonic keySignature");