X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=2264e27876a4e5473cda92b2328ac0ebaedccb55;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=26b3985e4e31fcb760a08701ec92f4f72cc2ac74;hpb=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 26b3985e4e..2264e27876 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -1,9 +1,20 @@ /* - 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 "bar-line.hh" @@ -18,13 +29,6 @@ #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); @@ -59,6 +63,7 @@ Key_engraver::Key_engraver () cancellation_ = 0; } + void Key_engraver::create_key (bool is_default) { @@ -67,8 +72,12 @@ Key_engraver::create_key (bool is_default) 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")); + get_property ("middleCClefPosition")); SCM last = get_property ("lastKeySignature"); SCM key = get_property ("keySignature"); @@ -81,10 +90,13 @@ 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 + || ((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); } } @@ -94,21 +106,20 @@ 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); } } @@ -122,18 +133,16 @@ Key_engraver::listen_key_change (Stream_event *ev) } 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,23 +171,37 @@ Key_engraver::read_event (Stream_event const *r) 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 ("Incomplete keyAlterationOrder for key signature"); + } + + context ()->set_property ("keySignature", scm_reverse (accs)); context ()->set_property ("tonic", r->get_property ("tonic")); } @@ -197,20 +220,25 @@ ADD_ACKNOWLEDGER (Key_engraver, clef); ADD_ACKNOWLEDGER (Key_engraver, bar_line); ADD_TRANSLATOR (Key_engraver, - /* doc */ "", - /* create */ "KeySignature", + /* doc */ + "Engrave a key signature.", + + /* create */ + "KeyCancellation " + "KeySignature ", /* read */ "createKeyOnClefChange " "explicitKeySignatureVisibility " + "extraNatural " "keyAlterationOrder " "keySignature " - "keySignature " "lastKeySignature " "printKeyCancellation " - , + "middleCClefPosition ", /* write */ "keySignature " "lastKeySignature " - "tonic ") + "tonic " + );