Change the behavior of nested StaffGroupers.

[lilypond.git] / lily / key-engraver.cc

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index e67247cd8c3c8a188bd40f9fab4363bfcd46f5bf..db223e66061c8fc3dcf75e2bf0d8414cbe21ac78 100644 (file)
--- 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);
@@ -196,7 +194,7 @@ Key_engraver::read_event (Stream_event const *r)
          }
 
       if (warn)
-       r->origin ()->warning ("No ordering for key signature alterations");      
+       r->origin ()->warning ("Incomplete keyAlterationOrder for key signature");
     }
   
   context ()->set_property ("keySignature", scm_reverse (accs));