source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "item.hh"
DECLARE_ACKNOWLEDGER (clef);
DECLARE_ACKNOWLEDGER (bar_line);
-
};
void
{
if (!item_)
{
- item_ = make_item ("KeySignature", key_event_ ? key_event_->self_scm () : SCM_EOL);
+ item_ = make_item ("KeySignature",
+ key_event_ ? key_event_->self_scm () : SCM_EOL);
item_->set_property ("c0-position",
get_property ("middleCPosition"));
SCM last = get_property ("lastKeySignature");
SCM key = get_property ("keySignature");
- if (to_boolean (get_property ("printKeyCancellation"))
+
+ if ((to_boolean (get_property ("printKeyCancellation"))
+ || key == SCM_EOL)
&& !scm_is_eq (last, key))
{
- cancellation_ = make_item ("KeyCancellation", key_event_ ? key_event_->self_scm () : SCM_EOL);
- cancellation_->set_property ("accidentals", last);
- cancellation_->set_property ("c0-position",
- get_property ("middleCPosition"));
+ SCM restore = SCM_EOL;
+ SCM *tail = &restore;
+ for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
+ {
+ if (scm_assoc (scm_caar (s), key) == SCM_BOOL_F)
+ {
+ *tail = scm_acons (scm_caar (s),
+ scm_from_int (0), *tail);
+ tail = SCM_CDRLOC (*tail);
+ }
+ }
+
+ 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 ("accidentals", key);
+ item_->set_property ("alteration-alist", key);
}
if (!is_default)
{
SCM visibility = get_property ("explicitKeySignatureVisibility");
item_->set_property ("break-visibility", visibility);
+ if (cancellation_)
+ cancellation_->set_property ("break-visibility", visibility);
}
}
(void)info;
SCM c = get_property ("createKeyOnClefChange");
if (to_boolean (c))
- {
- create_key (false);
- }
+ create_key (false);
}
void
{
(void)info;
if (scm_is_pair (get_property ("keySignature")))
- {
- create_key (true);
- }
+ create_key (true);
}
void
SCM n = scm_list_copy (p);
SCM accs = SCM_EOL;
- for (SCM s = get_property ("keyAccidentalOrder");
+ for (SCM s = get_property ("keyAlterationOrder");
scm_is_pair (s); s = scm_cdr (s))
{
if (scm_is_pair (scm_member (scm_car (s), n)))
context ()->set_property ("tonic", p.smobbed_copy ());
}
-
-ADD_ACKNOWLEDGER (Key_engraver,clef);
-ADD_ACKNOWLEDGER (Key_engraver,bar_line);
+ADD_ACKNOWLEDGER (Key_engraver, clef);
+ADD_ACKNOWLEDGER (Key_engraver, bar_line);
ADD_TRANSLATOR (Key_engraver,
- /* descr */ "",
- /* creats*/ "KeySignature",
- /* accepts */ "key-change-event",
- /* reads */ "keySignature printKeyCancellation lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
- /* write */ "lastKeySignature tonic keySignature");
+ /* doc */ "",
+ /* create */ "KeySignature",
+ /* accept */ "key-change-event",
+
+ /* read */
+ "createKeyOnClefChange "
+ "explicitKeySignatureVisibility "
+ "keyAlterationOrder "
+ "keySignature "
+ "keySignature "
+ "lastKeySignature "
+ "printKeyCancellation "
+ ,
+
+ /* write */
+ "keySignature "
+ "lastKeySignature "
+ "tonic ")