Merge with master

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index b3e9d4bd98b7c06b0deadcc89bc45ee27f847a61..c086f3d250198c6ce37431a81e70952825e8e5a3 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
@@ -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 "
                ,