X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=450b2c50e505fd60f8a45e0ed610fd39ec72974b;hb=7f6816438d66f6d70db5b68454d80656a0f3f131;hp=a4e2dbe22022c396d25e36448dead2ccc5b61a68;hpb=d7e4a5100d0f9650463dfdb19d2cc292aba2e4a9;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index a4e2dbe220..450b2c50e5 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,35 +3,33 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys - */ + (c) 1997--2005 Han-Wen Nienhuys +*/ - - -#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" +#include "pitch.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_ev (Music const * r); - Music * key_ev_; - Item * item_; + void read_ev (Music const *r); + Music *key_ev_; + Item *item_; + Item *cancellation_; public: TRANSLATOR_DECLARATIONS (Key_engraver); @@ -39,164 +37,156 @@ 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 stop_translation_timestep (); + void process_music (); + DECLARE_ACKNOWLEDGER(clef); + DECLARE_ACKNOWLEDGER(bar_line); + +}; void Key_engraver::finalize () { } - Key_engraver::Key_engraver () { key_ev_ = 0; item_ = 0; + cancellation_ = 0; } - void Key_engraver::create_key (bool def) { - if (!item_) + if (!item_) { - item_ = make_item ("KeySignature"); + item_ = make_item ("KeySignature", key_ev_ ? key_ev_->self_scm () : SCM_EOL); 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")); - announce_grob (item_, key_ev_ ? key_ev_->self_scm () : SCM_EOL); + 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_->set_property ("break-visibility",vis); + SCM vis = get_property ("explicitKeySignatureVisibility"); + if (ly_is_procedure (vis)) + item_->set_property ("break-visibility", vis); } -} - +} bool -Key_engraver::try_music (Music * ev) +Key_engraver::try_music (Music *ev) { if (ev->is_mus_type ("key-change-event")) { + /* do this only once, just to be on the safe side. */ 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; + } + return false; } - void -Key_engraver::acknowledge_grob (Grob_info info) +Key_engraver::acknowledge_clef (Grob_info info) { - if (Clef::has_interface (info.grob_)) + (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_line::has_interface (info.grob_) - && 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::process_music () { - if (key_ev_ || - get_property ("lastKeySignature") != get_property ("keySignature")) + if (key_ev_ + || get_property ("lastKeySignature") != get_property ("keySignature")) create_key (false); } - void Key_engraver::stop_translation_timestep () { - if (item_) - { - typeset_grob (item_); - item_ = 0; - } + item_ = 0; + context ()->set_property ("lastKeySignature", get_property ("keySignature")); + cancellation_ = 0; + key_ev_ = 0; } - void -Key_engraver::read_ev (Music const * r) +Key_engraver::read_ev (Music const *r) { SCM p = r->get_property ("pitch-alist"); - if (!gh_pair_p (p)) + 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 = ly_cdr (s)) + scm_is_pair (s); s = scm_cdr (s)) { - if (gh_pair_p (scm_member (ly_car (s), n))) + if (scm_is_pair (scm_member (scm_car (s), n))) { - accs = gh_cons (ly_car (s), accs); - n = scm_delete_x (ly_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 = ly_cdr (s)) - if (gh_scm2int (ly_cdar (s))) - accs = gh_cons (ly_car (s), accs); - daddy_context_->set_property ("keySignature", accs); - daddy_context_->set_property ("tonic" , - r->get_property ("tonic")); -} + 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::start_translation_timestep () -{ - key_ev_ = 0; - daddy_context_->set_property ("lastKeySignature", get_property ("keySignature")); + context ()->set_property ("keySignature", accs); + context ()->set_property ("tonic", + r->get_property ("tonic")); } - void Key_engraver::initialize () { - daddy_context_->set_property ("keySignature", SCM_EOL); - daddy_context_->set_property ("lastKeySignature", SCM_EOL); - - Pitch p (0,0,0); - daddy_context_->set_property ("tonic", p.smobbed_copy ()); + context ()->set_property ("keySignature", SCM_EOL); + context ()->set_property ("lastKeySignature", SCM_EOL); + Pitch p (0, 0, 0); + context ()->set_property ("tonic", p.smobbed_copy ()); } +#include "translator.icc" -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"); +ADD_ACKNOWLEDGER(Key_engraver,clef); +ADD_ACKNOWLEDGER(Key_engraver,bar_line); +ADD_TRANSLATOR (Key_engraver, + /* descr */ "", + /* creats*/ "KeySignature", + /* accepts */ "key-change-event", + /* reads */ "keySignature printKeyCancellation lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature", + /* write */ "lastKeySignature tonic keySignature");