X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=7997d11c33adb98e655d189691f211afd9714d0d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2ed905e447e1c59e242782deba1b778d10d69a65;hpb=98be1b40588a60f3d39cfd6aa538bd8fd071c435;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 2ed905e447..7997d11c33 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
@@ -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);
     }
 }
 
@@ -210,8 +208,11 @@ ADD_ACKNOWLEDGER (Key_engraver, clef);
 ADD_ACKNOWLEDGER (Key_engraver, bar_line);
 
 ADD_TRANSLATOR (Key_engraver,
-		/* doc */ "",
-		/* create */ "KeySignature",
+		/* doc */
+		"Engrave a key signature.",
+
+		/* create */
+		"KeySignature ",
 		
 		/* read */
 		"createKeyOnClefChange "
@@ -220,10 +221,10 @@ ADD_TRANSLATOR (Key_engraver,
 		"keyAlterationOrder "
 		"keySignature "
 		"lastKeySignature "
-		"printKeyCancellation "
-		,
+		"printKeyCancellation ",
 		
 		/* write */
 		"keySignature "
 		"lastKeySignature "
-		"tonic ")
+		"tonic "
+		);