X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=7997d11c33adb98e655d189691f211afd9714d0d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3f5d722c0ba0282222a4b3e6646bdc8456ffe60f;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 3f5d722c0b..7997d11c33 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,30 +3,27 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ -#include "item.hh" #include "bar-line.hh" -#include "staff-symbol-referencer.hh" +#include "clef.hh" #include "context.hh" #include "engraver.hh" +#include "item.hh" +#include "pitch.hh" #include "protected-scm.hh" -#include "clef.hh" +#include "staff-symbol-referencer.hh" +#include "stream-event.hh" -/* - TODO: The representation of key sigs is all fucked. -*/ +#include "translator.icc" -/** - Make the key signature. -*/ class Key_engraver : public Engraver { void create_key (bool); - void read_ev (Music const *r); + void read_event (Stream_event const *r); - Music *key_ev_; + Stream_event *key_event_; Item *item_; Item *cancellation_; public: @@ -35,11 +32,12 @@ public: 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_TRANSLATOR_LISTENER (key_change); + DECLARE_ACKNOWLEDGER (clef); + DECLARE_ACKNOWLEDGER (bar_line); }; void @@ -49,81 +47,98 @@ Key_engraver::finalize () Key_engraver::Key_engraver () { - key_ev_ = 0; + key_event_ = 0; item_ = 0; cancellation_ = 0; } + void -Key_engraver::create_key (bool def) +Key_engraver::create_key (bool is_default) { if (!item_) { - item_ = make_item ("KeySignature", key_ev_ ? key_ev_->self_scm () : SCM_EOL); + item_ = make_item ("KeySignature", + key_event_ ? key_event_->self_scm () : SCM_EOL); item_->set_property ("c0-position", get_property ("middleCPosition")); SCM last = get_property ("lastKeySignature"); SCM key = get_property ("keySignature"); - if (to_boolean (get_property ("printKeyCancellation")) + bool extranatural = to_boolean (get_property ("extraNatural")); + + if ((to_boolean (get_property ("printKeyCancellation")) + || key == SCM_EOL) && !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")); - + SCM restore = SCM_EOL; + SCM *tail = &restore; + for (SCM s = last; scm_is_pair (s); s = scm_cdr (s)) + { + SCM new_alter_pair = scm_assoc (scm_caar (s), key); + Rational old_alter = robust_scm2rational (scm_cdar (s), 0); + if (new_alter_pair == SCM_BOOL_F + || extranatural + && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter < Rational (0)) + { + *tail = scm_cons (scm_car (s), *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 ("new-accidentals", key); + + item_->set_property ("alteration-alist", key); } - if (!def) + if (!is_default) { - SCM vis = get_property ("explicitKeySignatureVisibility"); - if (ly_c_procedure_p (vis)) - item_->set_property ("break-visibility", vis); + SCM visibility = get_property ("explicitKeySignatureVisibility"); + item_->set_property ("break-visibility", visibility); } } -bool -Key_engraver::try_music (Music *ev) +IMPLEMENT_TRANSLATOR_LISTENER (Key_engraver, key_change); +void +Key_engraver::listen_key_change (Stream_event *ev) { - if (ev->is_mus_type ("key-change-event")) - { - /* 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; + /* do this only once, just to be on the safe side. */ + if (ASSIGN_EVENT_ONCE (key_event_, ev)) + read_event (key_event_); } void -Key_engraver::acknowledge_grob (Grob_info info) +Key_engraver::acknowledge_clef (Grob_info info) { - if (Clef::has_interface (info.grob_)) - { - SCM c = get_property ("createKeyOnClefChange"); - if (to_boolean (c)) - { - create_key (false); - } - } - else if (Bar_line::has_interface (info.grob_) - && scm_is_pair (get_property ("keySignature"))) - { - create_key (true); - } + (void)info; + SCM c = get_property ("createKeyOnClefChange"); + if (to_boolean (c)) + create_key (false); +} + +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_ + if (key_event_ || get_property ("lastKeySignature") != get_property ("keySignature")) create_key (false); } @@ -134,42 +149,51 @@ Key_engraver::stop_translation_timestep () item_ = 0; context ()->set_property ("lastKeySignature", get_property ("keySignature")); cancellation_ = 0; + key_event_ = 0; } void -Key_engraver::read_ev (Music const *r) +Key_engraver::read_event (Stream_event const *r) { 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"); - scm_is_pair (s); s = scm_cdr (s)) + + SCM alist = scm_list_copy (p); + SCM order = get_property ("keyAlterationOrder"); + for (SCM s = order; + scm_is_pair (s) && scm_is_pair (alist); s = scm_cdr (s)) { - if (scm_is_pair (scm_member (scm_car (s), n))) + SCM head = scm_member (scm_car (s), alist); + + if (scm_is_pair (head)) { - accs = scm_cons (scm_car (s), accs); - n = scm_delete_x (scm_car (s), n); + accs = scm_cons (scm_car (head), accs); + alist = scm_delete_x (scm_car (head), alist); } } - 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); - + if (scm_is_pair (alist)) + { + bool warn = false; + for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s)) + if (ly_scm2rational (scm_cdar (s))) + { + warn = true; + accs = scm_cons (scm_car (s), accs); + } + + if (warn) + r->origin ()->warning ("No ordering for key signature alterations"); + } + context ()->set_property ("keySignature", accs); context ()->set_property ("tonic", r->get_property ("tonic")); } -void -Key_engraver::start_translation_timestep () -{ - key_ev_ = 0; -} - void Key_engraver::initialize () { @@ -178,13 +202,29 @@ Key_engraver::initialize () 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, - /* 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"); + /* doc */ + "Engrave a key signature.", + + /* create */ + "KeySignature ", + + /* read */ + "createKeyOnClefChange " + "explicitKeySignatureVisibility " + "extraNatural " + "keyAlterationOrder " + "keySignature " + "lastKeySignature " + "printKeyCancellation ", + + /* write */ + "keySignature " + "lastKeySignature " + "tonic " + );