X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=e67247cd8c3c8a188bd40f9fab4363bfcd46f5bf;hb=e94c4a66c9d565749d8a121fc0267ddeb423ca13;hp=b0a87988a4809908419b5d4906a555cc5aa7ce53;hpb=f567a0b1e8efb2d4cf67eb02a3b21a9fa712d488;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index b0a87988a4..e67247cd8c 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -1,35 +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--2011 Han-Wen Nienhuys - (c) 1997--2006 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. + + 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 "item.hh" #include "bar-line.hh" -#include "staff-symbol-referencer.hh" +#include "clef.hh" #include "context.hh" #include "engraver.hh" -#include "protected-scm.hh" -#include "clef.hh" +#include "item.hh" #include "pitch.hh" +#include "protected-scm.hh" +#include "staff-symbol-referencer.hh" +#include "stream-event.hh" #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); + void read_event (Stream_event const *r); - Music *key_event_; + Stream_event *key_event_; Item *item_; Item *cancellation_; public: @@ -38,10 +43,10 @@ public: protected: virtual void initialize (); virtual void finalize (); - virtual bool try_music (Music *event); void stop_translation_timestep (); void process_music (); + DECLARE_TRANSLATOR_LISTENER (key_change); DECLARE_ACKNOWLEDGER (clef); DECLARE_ACKNOWLEDGER (bar_line); }; @@ -58,6 +63,7 @@ Key_engraver::Key_engraver () cancellation_ = 0; } + void Key_engraver::create_key (bool is_default) { @@ -71,6 +77,7 @@ Key_engraver::create_key (bool is_default) SCM last = get_property ("lastKeySignature"); SCM key = get_property ("keySignature"); + bool extranatural = to_boolean (get_property ("extraNatural")); if ((to_boolean (get_property ("printKeyCancellation")) || key == SCM_EOL) @@ -80,10 +87,14 @@ Key_engraver::create_key (bool is_default) 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) + 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_acons (scm_caar (s), - scm_from_int (0), *tail); + *tail = scm_cons (scm_car (s), *tail); tail = SCM_CDRLOC (*tail); } } @@ -93,53 +104,43 @@ Key_engraver::create_key (bool is_default) cancellation_ = make_item ("KeyCancellation", key_event_ ? key_event_->self_scm () : SCM_EOL); - - cancellation_->set_property ("alteration-alist", restore); + + cancellation_->set_property ("alteration-alist", scm_reverse (restore)); cancellation_->set_property ("c0-position", get_property ("middleCPosition")); } } - item_->set_property ("alteration-alist", key); + + item_->set_property ("alteration-alist", scm_reverse (key)); } if (!is_default) { SCM visibility = get_property ("explicitKeySignatureVisibility"); item_->set_property ("break-visibility", visibility); - if (cancellation_) - cancellation_->set_property ("break-visibility", visibility); } } -bool -Key_engraver::try_music (Music *event) +IMPLEMENT_TRANSLATOR_LISTENER (Key_engraver, key_change); +void +Key_engraver::listen_key_change (Stream_event *ev) { - if (event->is_mus_type ("key-change-event")) - { - /* do this only once, just to be on the safe side. */ - if (!key_event_) - { - key_event_ = event; - read_event (key_event_); - } - 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_clef (Grob_info info) +Key_engraver::acknowledge_clef (Grob_info /* info */) { - (void)info; SCM c = get_property ("createKeyOnClefChange"); if (to_boolean (c)) create_key (false); } void -Key_engraver::acknowledge_bar_line (Grob_info info) +Key_engraver::acknowledge_bar_line (Grob_info /* info */) { - (void)info; if (scm_is_pair (get_property ("keySignature"))) create_key (true); } @@ -162,29 +163,43 @@ Key_engraver::stop_translation_timestep () } void -Key_engraver::read_event (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 ("keyAlterationOrder"); - 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); - - context ()->set_property ("keySignature", 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", scm_reverse (accs)); context ()->set_property ("tonic", r->get_property ("tonic")); } @@ -203,21 +218,24 @@ ADD_ACKNOWLEDGER (Key_engraver, clef); ADD_ACKNOWLEDGER (Key_engraver, bar_line); ADD_TRANSLATOR (Key_engraver, - /* doc */ "", - /* create */ "KeySignature", - /* accept */ "key-change-event", + /* doc */ + "Engrave a key signature.", + + /* create */ + "KeyCancellation " + "KeySignature ", /* read */ "createKeyOnClefChange " "explicitKeySignatureVisibility " + "extraNatural " "keyAlterationOrder " "keySignature " - "keySignature " "lastKeySignature " - "printKeyCancellation " - , + "printKeyCancellation ", /* write */ "keySignature " "lastKeySignature " - "tonic ") + "tonic " + );