X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=0b0a282064ec3b6bdb1dd03449f6507344b068ee;hb=9a4a902c3241341e0ffe7006eb17158651a15c34;hp=22731640fa64d376651bb48a2bdcdbb5e8a440ca;hpb=a276a19dc6bd57832db3107f2f2cbb04cb4677b6;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 22731640fa..0b0a282064 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -66,7 +66,7 @@ Key_engraver::create_key (bool is_default)
 
       SCM last = get_property ("lastKeySignature");
       SCM key = get_property ("keySignature");
-      bool extranatural = to_boolean(get_property("extraNatural"));
+      bool extranatural = to_boolean (get_property ("extraNatural"));
 
       if ((to_boolean (get_property ("printKeyCancellation"))
 	   || key == SCM_EOL)
@@ -77,7 +77,7 @@ Key_engraver::create_key (bool is_default)
 	  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));
+	      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))
@@ -106,8 +106,6 @@ Key_engraver::create_key (bool is_default)
     {
       SCM visibility = get_property ("explicitKeySignatureVisibility");
       item_->set_property ("break-visibility", visibility);
-      if (cancellation_)
-	cancellation_->set_property ("break-visibility", visibility);
     }
 }
 
@@ -219,7 +217,6 @@ ADD_TRANSLATOR (Key_engraver,
 		"extraNatural "
 		"keyAlterationOrder "
 		"keySignature "
-		"keySignature "
 		"lastKeySignature "
 		"printKeyCancellation "
 		,