X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=a61d7701d768dbb4c28246ac72743c3d7265303a;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=30c8bac2854873840435a86c069c169ffb9645e4;hpb=14d74ac262744d16fc753ee41042d32860d58633;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 30c8bac285..a61d7701d7 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -1,32 +1,40 @@ /* - key-engraver.cc -- implement Key_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2015 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys - */ + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -#include "item.hh" -#include "bar-line.hh" -#include "staff-symbol-referencer.hh" + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ + +#include "clef.hh" #include "context.hh" #include "engraver.hh" +#include "international.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,167 +43,206 @@ 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 (); + void listen_key_change (Stream_event *); + void acknowledge_clef (Grob_info); + void acknowledge_bar_line (Grob_info); +}; void Key_engraver::finalize () { } - -Key_engraver::Key_engraver () +Key_engraver::Key_engraver (Context *c) + : Engraver (c) { - 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_) + 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); + /* Use middleCClefPosition rather than middleCPosition, because cue + * notes with a different clef will modify middleCPosition. The + * Key signature, however, should still be printed at the original + * position. */ item_->set_property ("c0-position", - get_property ("middleCPosition")); - - 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); + get_property ("middleCClefPosition")); + + SCM last = get_property ("lastKeyAlterations"); + SCM key = get_property ("keyAlterations"); + + if ((to_boolean (get_property ("printKeyCancellation")) + || scm_is_null (key)) + && !scm_is_eq (last, key)) + { + SCM restore = SCM_EOL; + 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 (scm_is_false (new_alter_pair) + || ((ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter) * old_alter + < Rational (0))) + { + restore = scm_cons (scm_car (s), restore); + } + } + + 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 ("middleCClefPosition")); + } + } + + item_->set_property ("alteration-alist", scm_reverse (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); + item_->set_property ("non-default", SCM_BOOL_T); } -} - +} -bool -Key_engraver::try_music (Music * ev) +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); - } + SCM c = get_property ("createKeyOnClefChange"); + if (to_boolean (c)) + create_key (false); } +void +Key_engraver::acknowledge_bar_line (Grob_info /* info */) +{ + create_key (true); +} void Key_engraver::process_music () { - if (key_ev_ || - get_property ("lastKeySignature") != get_property ("keySignature")) + if (key_event_ + || !scm_is_eq (get_property ("lastKeyAlterations"), + get_property ("keyAlterations"))) create_key (false); } - void Key_engraver::stop_translation_timestep () { item_ = 0; - context ()->set_property ("lastKeySignature", get_property ("keySignature")); - cancellation_ = 0; + context ()->set_property ("lastKeyAlterations", get_property ("keyAlterations")); + 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))) - { - accs = scm_cons (scm_car (s), accs); - n = scm_delete_x (scm_car (s), n); - } + SCM head = scm_member (scm_car (s), alist); + + if (scm_is_pair (head)) + { + 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); - - context ()->set_property ("keySignature", accs); - context ()->set_property ("tonic" , - r->get_property ("tonic")); -} + 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 (_ ("Incomplete keyAlterationOrder for key signature")); + } -void -Key_engraver::start_translation_timestep () -{ - key_ev_ = 0; + context ()->set_property ("keyAlterations", scm_reverse_x (accs, SCM_EOL)); + context ()->set_property ("tonic", + r->get_property ("tonic")); } - void Key_engraver::initialize () { - context ()->set_property ("keySignature", SCM_EOL); - context ()->set_property ("lastKeySignature", SCM_EOL); + context ()->set_property ("keyAlterations", SCM_EOL); + context ()->set_property ("lastKeyAlterations", SCM_EOL); - Pitch p (0,0,0); + Pitch p; context ()->set_property ("tonic", p.smobbed_copy ()); - } +void +Key_engraver::boot () +{ + ADD_LISTENER (Key_engraver, key_change); + 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 */ + "KeyCancellation " + "KeySignature ", + + /* read */ + "createKeyOnClefChange " + "explicitKeySignatureVisibility " + "extraNatural " + "keyAlterationOrder " + "keyAlterations " + "lastKeyAlterations " + "printKeyCancellation " + "middleCClefPosition ", + + /* write */ + "keyAlterations " + "lastKeyAlterations " + "tonic " + );