(all-grob-descriptions): set thickness to

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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index b0d2557da82346e0e53898d1b3414fd6f7f24502..a35134c165b86ae076b288f541078120d3983de3 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "item.hh"
@@ -76,10 +76,6 @@ Key_engraver::create_key (bool is_default)
           || key == SCM_EOL)
          && !scm_is_eq (last, key))
        {
-         cancellation_ = make_item ("KeyCancellation",
-                                    key_event_
-                                    ? key_event_->self_scm () : SCM_EOL);
-
          SCM restore = SCM_EOL;
          SCM *tail = &restore;
          for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
@@ -92,9 +88,16 @@ Key_engraver::create_key (bool is_default)
                }
            }
 
-         cancellation_->set_property ("alteration-alist", restore);
-         cancellation_->set_property ("c0-position",
-                                      get_property ("middleCPosition"));
+         if (scm_is_pair (restore))
+           {
+             cancellation_ = make_item ("KeyCancellation",
+                                        key_event_
+                                        ? key_event_->self_scm () : SCM_EOL);
+         
+             cancellation_->set_property ("alteration-alist", restore);
+             cancellation_->set_property ("c0-position",
+                                          get_property ("middleCPosition"));
+           }
        }
       item_->set_property ("alteration-alist", key);
     }