- item_p_ = new Item (get_property ("KeySignature"));
-
- item_p_->set_grob_property ("c0-position", gh_int2scm (0));
-
- // todo: put this in basic props.
- item_p_->set_grob_property ("old-accidentals", old_accs_);
- item_p_->set_grob_property ("new-accidentals", get_property ("keySignature"));
-
- Staff_symbol_referencer::set_interface (item_p_);
- Key_item::set_interface (item_p_);
-
- SCM prop = get_property ("keyOctaviation");
- bool multi = to_boolean (prop);
-
- if (multi)
- item_p_->set_grob_property ("multi-octave", gh_bool2scm (multi));
-
- announce_grob (item_p_,keyreq_l_);
+ item_ = make_item ("KeySignature",
+ key_event_ ? key_event_->self_scm () : SCM_EOL);
+
+ /* Use middleCClefPosition rather than middleCPosition, because cue
+ * notes with a different clef will modify middleCPosition. The
+ * Key signature, however, should still be printed at the original
+ * position. */
+ item_->set_property ("c0-position",
+ get_property ("middleCClefPosition"));
+
+ SCM last = get_property ("lastKeyAlterations");
+ SCM key = get_property ("keyAlterations");
+
+ if ((to_boolean (get_property ("printKeyCancellation"))
+ || scm_is_null (key))
+ && !scm_is_eq (last, key))
+ {
+ SCM restore = SCM_EOL;
+ 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 = robust_scm2rational (scm_cdar (s), 0);
+ if (scm_is_false (new_alter_pair)
+ || ((ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter) * old_alter
+ < Rational (0)))
+ {
+ restore = scm_cons (scm_car (s), restore);
+ }
+ }
+
+ 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 ("middleCClefPosition"));
+ }
+ }
+
+ item_->set_property ("alteration-alist", scm_reverse (key));