X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=a13b4315a6d869cf6b902c677f199cfd1cc80d9f;hb=3e07faa176c300184b2e41d0dcfa779360519359;hp=66c1463383f4baf0cefe87919e7ecec9b80d326e;hpb=fc5394c7751ea902382ecc9022854583aff0d95e;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 66c1463383..a13b4315a6 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,200 +3,200 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#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 "time-description.hh" -Key_engraver::Key_engraver () + +#include "event.hh" +#include "item.hh" +#include "bar-line.hh" +#include "staff-symbol-referencer.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. + */ +class Key_engraver : public Engraver +{ + void create_key (bool); + void read_ev (Music const * r); + Music * key_ev_; + Item * item_; + +public: + TRANSLATOR_DECLARATIONS (Key_engraver); + +protected: + 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::finalize () { - item_p_ = 0; - do_post_move_processing (); } -bool -Key_engraver::key_changed_b () const + +Key_engraver::Key_engraver () { - return keyreq_l_ ; + key_ev_ = 0; + item_ = 0; } + void -Key_engraver::create_key () +Key_engraver::create_key (bool def) { - if (!item_p_) + if (!item_) { - item_p_ = new Key_item; - item_p_->set_elt_property (break_priority_scm_sym, gh_int2scm(-1)); // ugh - item_p_->multi_octave_b_ = key_.multi_octave_b_; - announce_element (Score_element_info (item_p_,keyreq_l_)); + item_ = make_item ("KeySignature"); + + item_->set_property ("c0-position", + get_property ("middleCPosition")); + if (to_boolean (get_property ("printKeyCancellation"))) + item_->set_property ("old-accidentals", get_property ("lastKeySignature")); + item_->set_property ("new-accidentals", get_property ("keySignature")); - 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); - } + announce_grob (item_, key_ev_ ? key_ev_->self_scm () : SCM_EOL); + } - for (int i = 0 ; i< old_accidental_idx_arr_.size(); i++) - { - 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); - } + if (!def) + { + 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_); + if (!key_ev_) + { + /* + do this only once, just to be on the safe side. + */ + key_ev_ = ev; + read_ev (key_ev_); + } + return true; } return false; } + void -Key_engraver::acknowledge_element (Score_element_info info) +Key_engraver::acknowledge_grob (Grob_info info) { - if (dynamic_cast (info.req_l_)) - { - int i= get_property ("createKeyOnClefChange", 0).length_i (); - if (i) - create_key (); - } - else if (dynamic_cast (info.elem_l_) - && accidental_idx_arr_.size ()) + if (Clef::has_interface (info.grob_)) { - bool def = (!item_p_); - create_key (); - if (def) + SCM c = get_property ("createKeyOnClefChange"); + if (to_boolean (c)) { - item_p_->set_elt_property (visibility_lambda_scm_sym, - ly_ch_C_eval_scm ("postbreak_only_visibility")); + create_key (false); } } - -} - -void -Key_engraver::do_process_requests () -{ - if (keyreq_l_) + else if (Bar_line::has_interface (info.grob_) + && ly_c_pair_p (get_property ("keySignature"))) { - create_key (); + 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_ev_ || + get_property ("lastKeySignature") != get_property ("keySignature")) + create_key (false); } -/* - TODO Slightly hairy. - */ void -Key_engraver::read_req (Key_change_req const * r) +Key_engraver::stop_translation_timestep () { - old_accidental_idx_arr_ = accidental_idx_arr_; - key_.clear (); - Scalar prop = get_property ("keyOctaviation", 0); - if (prop.length_i () > 0) + if (item_) { - key_.multi_octave_b_ = ! prop.to_bool (); + typeset_grob (item_); + item_ = 0; } - - accidental_idx_arr_.clear (); +} - if (r->key_.ordinary_key_b_) - { - 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) - { - 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 +void +Key_engraver::read_ev (Music const * r) +{ + SCM p = r->get_property ("pitch-alist"); + if (!ly_c_pair_p (p)) + return; + + SCM n = scm_list_copy (p); + SCM accs = SCM_EOL; + for (SCM s = get_property ("keyAccidentalOrder"); + ly_c_pair_p (s); s = ly_cdr (s)) { - for (int i = 0; i < r->key_.pitch_arr_.size (); i ++) + if (ly_c_pair_p (scm_member (ly_car (s), n))) { - 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 (ly_car (s), accs); + n = scm_delete_x (ly_car (s), n); } } + + for (SCM s = n ; ly_c_pair_p (s); s = ly_cdr (s)) + if (ly_scm2int (ly_cdar (s))) + accs = scm_cons (ly_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_accidental_idx_arr_.clear (); + key_ev_ = 0; + context ()->set_property ("lastKeySignature", get_property ("keySignature")); } +void +Key_engraver::initialize () +{ + 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); +ENTER_DESCRIPTION (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");