X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=a35134c165b86ae076b288f541078120d3983de3;hb=545092a25d8ca41dc90b87482474b3719f7130a9;hp=88ca9e102cf3b2b12ba04caf7221bf913616c0a3;hpb=dd36ce6e97590323a7b6a61eb4a3f08d265c5b6e;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 88ca9e102c..a35134c165 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,206 +3,208 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys - */ -// clean me up -#include "key-engraver.hh" -#include "key-item.hh" -#include "command-request.hh" -#include "local-key-engraver.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 "context.hh" +#include "engraver.hh" +#include "protected-scm.hh" +#include "clef.hh" +#include "pitch.hh" -Key_engraver::Key_engraver () +#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_event (Music const *r); + + Music *key_event_; + Item *item_; + Item *cancellation_; +public: + TRANSLATOR_DECLARATIONS (Key_engraver); + +protected: + 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 () { - item_p_ = 0; - do_post_move_processing (); } -bool -Key_engraver::key_changed_b () const +Key_engraver::Key_engraver () { - return keyreq_l_ ; + key_event_ = 0; + item_ = 0; + cancellation_ = 0; } void -Key_engraver::create_key () +Key_engraver::create_key (bool is_default) { - if (!item_p_) + if (!item_) { - item_p_ = new Key_item; - Staff_symbol_referencer_interface st (item_p_); - st.set_interface (); - - item_p_->set_elt_property ("break-aligned", SCM_BOOL_T); // ugh - - item_p_->set_elt_property ("multi-octave", - gh_bool2scm (key_.multi_octave_b_)); - - announce_element (Score_element_info (item_p_,keyreq_l_)); - - - for (int i = 0; i < accidental_idx_arr_.size(); i++) - { - Musical_pitch m_l =accidental_idx_arr_[i]; - int a =m_l.accidental_i_; - if (key_.multi_octave_b_) - item_p_->add (m_l.steps (), a); - else - item_p_->add (m_l.notename_i_, a); - } + item_ = make_item ("KeySignature", + key_event_ ? key_event_->self_scm () : SCM_EOL); - for (int i = 0 ; i < old_accidental_idx_arr_.size(); i++) + item_->set_property ("c0-position", + get_property ("middleCPosition")); + + SCM last = get_property ("lastKeySignature"); + SCM key = get_property ("keySignature"); + + if ((to_boolean (get_property ("printKeyCancellation")) + || key == SCM_EOL) + && !scm_is_eq (last, key)) { - Musical_pitch m_l =old_accidental_idx_arr_[i]; - int a =m_l.accidental_i_; - if (key_.multi_octave_b_) - item_p_->add_old (m_l.steps (), a); - else - item_p_->add_old (m_l.notename_i_, a); + 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); + } + } + + if (scm_is_pair (restore)) + { + cancellation_ = make_item ("KeyCancellation", + key_event_ + ? key_event_->self_scm () : SCM_EOL); + + cancellation_->set_property ("alteration-alist", restore); + cancellation_->set_property ("c0-position", + get_property ("middleCPosition")); + } } + item_->set_property ("alteration-alist", key); } -} - -bool -Key_engraver::do_try_music (Music * req_l) -{ - if (Key_change_req *kc = dynamic_cast (req_l)) + if (!is_default) { - if (keyreq_l_) - warning (_ ("FIXME: key change merge")); - keyreq_l_ = kc; - read_req (keyreq_l_); - return true; - } - return false; + SCM visibility = get_property ("explicitKeySignatureVisibility"); + item_->set_property ("break-visibility", visibility); + } } -void -Key_engraver::acknowledge_element (Score_element_info info) +bool +Key_engraver::try_music (Music *event) { - if (dynamic_cast (info.req_l_)) - { - SCM c = get_property ("createKeyOnClefChange"); - if (to_boolean (c)) - create_key (); - } - else if (dynamic_cast (info.elem_l_) - && accidental_idx_arr_.size ()) + if (event->is_mus_type ("key-change-event")) { - bool def = (!item_p_); - create_key (); - if (!def) + /* do this only once, just to be on the safe side. */ + if (!key_event_) { - item_p_->set_elt_property ("visibility-lambda", - ly_eval_str ("all-visible")); + key_event_ = event; + read_event (key_event_); } + return true; } + return false; +} +void +Key_engraver::acknowledge_clef (Grob_info info) +{ + (void)info; + SCM c = get_property ("createKeyOnClefChange"); + if (to_boolean (c)) + create_key (false); } void -Key_engraver::do_process_music () +Key_engraver::acknowledge_bar_line (Grob_info info) { - if (keyreq_l_) - { - create_key (); - } + (void)info; + if (scm_is_pair (get_property ("keySignature"))) + create_key (true); } void -Key_engraver::do_pre_move_processing () -{ - if (item_p_) - { - typeset_element (item_p_); - item_p_ = 0; - } +Key_engraver::process_music () +{ + if (key_event_ + || get_property ("lastKeySignature") != get_property ("keySignature")) + create_key (false); } +void +Key_engraver::stop_translation_timestep () +{ + item_ = 0; + context ()->set_property ("lastKeySignature", get_property ("keySignature")); + cancellation_ = 0; + key_event_ = 0; +} -/* - TODO Slightly hairy. - */ void -Key_engraver::read_req (Key_change_req const * r) +Key_engraver::read_event (Music const *r) { - if (!r->key_) + SCM p = r->get_property ("pitch-alist"); + if (!scm_is_pair (p)) return; - - old_accidental_idx_arr_ = accidental_idx_arr_; - key_.clear (); - SCM prop = get_property ("keyOctaviation"); - - key_.multi_octave_b_ = to_boolean (prop); - - accidental_idx_arr_.clear (); - if (r->key_->ordinary_key_b_) + SCM n = scm_list_copy (p); + SCM accs = SCM_EOL; + for (SCM s = get_property ("keyAlterationOrder"); + scm_is_pair (s); s = scm_cdr (s)) { - int no_of_acc = r->key_->ordinary_accidentals_i (); - - // Hmm, can't these be handled/constructed by Key_change_req? - if (no_of_acc < 0) + if (scm_is_pair (scm_member (scm_car (s), n))) { - int accidental = 6 ; // First accidental: bes - for ( ; no_of_acc < 0 ; no_of_acc++ ) - { - Musical_pitch m; - m.accidental_i_ = -1; - m.notename_i_ = accidental; - if (key_.multi_octave_b_) - key_.set (m); - else - key_.set (m.notename_i_, m.accidental_i_); - accidental_idx_arr_.push (m); - - accidental = (accidental + 3) % 7 ; - } - } - else - { - int accidental = 3 ; // First accidental: fis - for ( ; no_of_acc > 0 ; no_of_acc-- ) - { - Musical_pitch m; - m.accidental_i_ = 1; - m.notename_i_ = accidental; - if (key_.multi_octave_b_) - key_.set (m); - else - key_.set (m.notename_i_, m.accidental_i_); - accidental_idx_arr_.push (m); - - accidental = (accidental + 4) % 7 ; - } - } - } - else // Special key - { - for (int i = 0; i < r->key_->pitch_arr_.size (); i ++) - { - Musical_pitch m_l =r->key_->pitch_arr_[i]; - if (key_.multi_octave_b_) - key_.set (m_l); - else - key_.set (m_l.notename_i_, m_l.accidental_i_); - - accidental_idx_arr_.push (m_l); + accs = scm_cons (scm_car (s), accs); + n = scm_delete_x (scm_car (s), n); } } + + 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::initialize () { - keyreq_l_ = 0; - old_accidental_idx_arr_.clear (); -} + 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_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");