* Ignore test failures on non-i386/amd64 architectures (Closes:

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 45300af68628efd9bbcf3c5c4321d2d4a3de07e9..11234556fd058961112b96b1a9b947eed478f7da 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
@@ -79,8 +79,9 @@ 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))
+                 || (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);
@@ -210,6 +211,7 @@ ADD_TRANSLATOR (Key_engraver,
                "Engrave a key signature.",
 
                /* create */
+               "KeyCancellation "
                "KeySignature ",
                
                /* read */