X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=fd60570821e05dc37f875d0255942d82b63f7284;hb=da77ae29b4974f89fa168729ffcda756a39688c0;hp=8bd0d1305fc89936907e4246b6a9c3b5878ec4db;hpb=cf5b2dd83e1f12e53181e9b43c62aa2e70137622;p=lilypond.git diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 8bd0d1305f..fd60570821 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--2012 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" @@ -52,80 +63,60 @@ Key_engraver::Key_engraver () cancellation_ = 0; } - -SCM -make_qt_key (SCM rat_key) -{ - SCM qt_key = SCM_EOL; - SCM *tail = &qt_key; - - for (SCM s = rat_key; scm_is_pair (s); s = scm_cdr (s)) - { - *tail = scm_cons (scm_cons (scm_caar (s), - scm_from_int (Rational (4)* ly_scm2rational (scm_cdar (s)))), - SCM_EOL); - tail = SCM_CDRLOC (*tail); - } - - return qt_key; -} - void Key_engraver::create_key (bool is_default) { if (!item_) { item_ = make_item ("KeySignature", - key_event_ ? key_event_->self_scm () : SCM_EOL); + 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"); - bool extranatural = to_boolean(get_property("extraNatural")); if ((to_boolean (get_property ("printKeyCancellation")) - || key == SCM_EOL) - && !scm_is_eq (last, key)) - { - 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 = ly_scm2rational (scm_cdar (s)); - 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", make_qt_key (restore)); - cancellation_->set_property ("c0-position", - get_property ("middleCPosition")); - } - } - - - item_->set_property ("alteration-alist", make_qt_key (key)); + || key == SCM_EOL) + && !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 (new_alter_pair == SCM_BOOL_F + || ((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 ("middleCPosition")); + } + } + + 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); } } @@ -139,18 +130,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); } @@ -187,31 +176,31 @@ Key_engraver::read_event (Stream_event const *r) scm_is_pair (s) && scm_is_pair (alist); s = scm_cdr (s)) { 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); - } + { + accs = scm_cons (scm_car (head), accs); + alist = scm_delete_x (scm_car (head), alist); + } } 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 (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"); + r->origin ()->warning ("Incomplete keyAlterationOrder for key signature"); } - - context ()->set_property ("keySignature", accs); + + context ()->set_property ("keySignature", scm_reverse_x (accs, SCM_EOL)); context ()->set_property ("tonic", - r->get_property ("tonic")); + r->get_property ("tonic")); } void @@ -228,21 +217,25 @@ ADD_ACKNOWLEDGER (Key_engraver, clef); ADD_ACKNOWLEDGER (Key_engraver, bar_line); ADD_TRANSLATOR (Key_engraver, - /* doc */ "", - /* create */ "KeySignature", - - /* read */ - "createKeyOnClefChange " - "explicitKeySignatureVisibility " - "extraNatural " - "keyAlterationOrder " - "keySignature " - "keySignature " - "lastKeySignature " - "printKeyCancellation " - , - - /* write */ - "keySignature " - "lastKeySignature " - "tonic ") + /* doc */ + "Engrave a key signature.", + + /* create */ + "KeyCancellation " + "KeySignature ", + + /* read */ + "createKeyOnClefChange " + "explicitKeySignatureVisibility " + "extraNatural " + "keyAlterationOrder " + "keySignature " + "lastKeySignature " + "printKeyCancellation " + "middleCClefPosition ", + + /* write */ + "keySignature " + "lastKeySignature " + "tonic " + );