X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=80727b141e553d1414ab46a58cd574a8a42904fb;hb=91821bd59959b1289f2d711509017a4dacebecd2;hp=9208f26ab3850017d7965c0f5c0a5b7535ef8704;hpb=0af2486a28f1c60b9de929a9101964d880927e54;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 9208f26ab3..80727b141e 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,176 +3,210 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys - */ - -#include "key-item.hh" -#include "command-request.hh" -#include "musical-request.hh" -#include "local-key-item.hh" -#include "bar.hh" -#include "timing-translator.hh" + (c) 1997--2005 Han-Wen Nienhuys +*/ + +#include "item.hh" +#include "bar-line.hh" #include "staff-symbol-referencer.hh" -#include "translator-group.hh" +#include "context.hh" #include "engraver.hh" -#include "musical-pitch.hh" #include "protected-scm.hh" #include "clef.hh" +#include "pitch.hh" + +#include "translator.icc" + +/* + TODO: The representation of key sigs is all fucked. +*/ /** - Make the key signature. - */ -class Key_engraver : public Engraver { - void create_key(bool); - void read_req (Key_change_req const * r); + Make the key signature. +*/ +class Key_engraver : public Engraver +{ + void create_key (bool); + void read_event (Music const *r); + Music *key_event_; + 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 bool do_try_music (Music *req_l); - virtual void do_process_music(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - virtual void acknowledge_element (Score_element_info); + virtual void initialize (); + virtual void finalize (); + virtual bool try_music (Music *event); + void stop_translation_timestep (); + void process_music (); + + DECLARE_ACKNOWLEDGER (clef); + DECLARE_ACKNOWLEDGER (bar_line); }; +void +Key_engraver::finalize () +{ +} Key_engraver::Key_engraver () { - keyreq_l_ = 0; - item_p_ = 0; + key_event_ = 0; + item_ = 0; + cancellation_ = 0; } void -Key_engraver::create_key (bool def) +Key_engraver::create_key (bool is_default) { - if (!item_p_) + if (!item_) { - item_p_ = new Item ( get_property ("basicKeyProperties")); - - item_p_->set_elt_property ("c0-position", gh_int2scm (0)); + item_ = make_item ("KeySignature", + key_event_ ? key_event_->self_scm () : SCM_EOL); - // 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")); + item_->set_property ("c0-position", + get_property ("middleCPosition")); - Staff_symbol_referencer::set_interface (item_p_); + SCM last = get_property ("lastKeySignature"); + SCM key = get_property ("keySignature"); - SCM prop = get_property ("keyOctaviation"); - bool multi = to_boolean (prop); - - if (multi) - item_p_->set_elt_property ("multi-octave", gh_bool2scm (multi)); - - announce_element (Score_element_info (item_p_,keyreq_l_)); + if ((to_boolean (get_property ("printKeyCancellation")) + || key == SCM_EOL) + && !scm_is_eq (last, key)) + { + cancellation_ = make_item ("KeyCancellation", + key_event_ + ? key_event_->self_scm () : SCM_EOL); + + SCM restore = SCM_EOL; + SCM *tail = &restore; + for (SCM s = last; scm_is_pair (s); s = scm_cdr (s)) + { + if (scm_assoc (scm_caar (s), key) == SCM_BOOL_F) + { + *tail = scm_acons (scm_caar (s), + scm_from_int (0), *tail); + tail = SCM_CDRLOC(*tail); + } + } + + cancellation_->set_property ("alteration-alist", restore); + cancellation_->set_property ("c0-position", + get_property ("middleCPosition")); + } + item_->set_property ("alteration-alist", key); } - if (!def) - item_p_->set_elt_property ("visibility-lambda", - scm_eval (ly_symbol2scm ("all-visible"))); - -} - + if (!is_default) + { + SCM visibility = get_property ("explicitKeySignatureVisibility"); + item_->set_property ("break-visibility", visibility); + } +} bool -Key_engraver::do_try_music (Music * req_l) +Key_engraver::try_music (Music *event) { - if (Key_change_req *kc = dynamic_cast (req_l)) + if (event->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_event_) + { + key_event_ = event; + read_event (key_event_); + } return true; - } - return false; + } + return false; } void -Key_engraver::acknowledge_element (Score_element_info info) +Key_engraver::acknowledge_clef (Grob_info info) { - if (Clef::has_interface (info.elem_l_)) + (void)info; + SCM c = get_property ("createKeyOnClefChange"); + if (to_boolean (c)) { - SCM c = get_property ("createKeyOnClefChange"); - if (to_boolean (c)) - { - create_key (false); - } + create_key (false); } - else if (Bar::has_interface (info.elem_l_) - && gh_pair_p (get_property ("keySignature"))) +} + +void +Key_engraver::acknowledge_bar_line (Grob_info info) +{ + (void)info; + if (scm_is_pair (get_property ("keySignature"))) { create_key (true); } - } void -Key_engraver::do_process_music () +Key_engraver::process_music () { - if (keyreq_l_ || old_accs_ != get_property ("keySignature")) - { - create_key (false); - } + if (key_event_ + || get_property ("lastKeySignature") != get_property ("keySignature")) + create_key (false); } void -Key_engraver::do_pre_move_processing () -{ - if (item_p_) - { - typeset_element (item_p_); - item_p_ = 0; - } +Key_engraver::stop_translation_timestep () +{ + item_ = 0; + context ()->set_property ("lastKeySignature", get_property ("keySignature")); + cancellation_ = 0; + key_event_ = 0; } void -Key_engraver::read_req (Key_change_req const * r) +Key_engraver::read_event (Music const *r) { - if (r->pitch_alist_ == SCM_UNDEFINED) + SCM p = r->get_property ("pitch-alist"); + if (!scm_is_pair (p)) return; - SCM n = scm_list_copy (r->pitch_alist_); + SCM n = scm_list_copy (p); SCM accs = SCM_EOL; - for (SCM s = get_property ("keyAccidentalOrder"); - gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = get_property ("keyAlterationOrder"); + 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); -void -Key_engraver::do_post_move_processing () -{ - keyreq_l_ = 0; - old_accs_ = get_property ("keySignature"); + context ()->set_property ("keySignature", accs); + context ()->set_property ("tonic", + r->get_property ("tonic")); } 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); + + Pitch p (0, 0, 0); + context ()->set_property ("tonic", p.smobbed_copy ()); } -ADD_THIS_TRANSLATOR (Key_engraver); +ADD_ACKNOWLEDGER (Key_engraver,clef); +ADD_ACKNOWLEDGER (Key_engraver,bar_line); +ADD_TRANSLATOR (Key_engraver, + /* doc */ "", + /* create */ "KeySignature", + /* accept */ "key-change-event", + /* read */ "keySignature printKeyCancellation lastKeySignature " + "explicitKeySignatureVisibility createKeyOnClefChange " + "keyAlterationOrder keySignature", + /* write */ "lastKeySignature tonic keySignature");