From 759c629f12de9f6604c5770f23902da72b9492ad Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Wed, 9 Feb 2011 10:57:41 +0000 Subject: [PATCH] make key cancellations independent of extraNatural --- ...ey-signature-cancellation-extra-natural.ly | 23 ------------------- lily/key-engraver.cc | 6 ++--- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 input/regression/key-signature-cancellation-extra-natural.ly diff --git a/input/regression/key-signature-cancellation-extra-natural.ly b/input/regression/key-signature-cancellation-extra-natural.ly deleted file mode 100644 index 676e1dc2ef..0000000000 --- a/input/regression/key-signature-cancellation-extra-natural.ly +++ /dev/null @@ -1,23 +0,0 @@ -\header { - - texidoc = "If @code{extraNatural} is set then keys that are not - altered farther away (eg from sharp to double sharp) are - cancelled. Otherwise only keys that do not occur in the new key - signature are cancelled." } - - -\version "2.12.0" - -\paper { - ragged-right = ##t -} -{ - \set Staff.extraNatural = ##f - \key fes \major r1 - \key as \major r1_"No B-natural (#f)" - \set Staff.extraNatural = ##t - \key gis \major r1 - \key b \major r1_"with F-natural (#t)" - -} - diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index e67247cd8c..66b6e00a2b 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -77,7 +77,6 @@ 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) @@ -90,9 +89,8 @@ Key_engraver::create_key (bool is_default) 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))) + || ((ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter) * old_alter + < Rational (0))) { *tail = scm_cons (scm_car (s), *tail); tail = SCM_CDRLOC (*tail); -- 2.39.2