/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
void stop_translation_timestep ();
void process_music ();
- DECLARE_TRANSLATOR_LISTENER (key_change);
- DECLARE_ACKNOWLEDGER (clef);
- DECLARE_ACKNOWLEDGER (bar_line);
+ void listen_key_change (Stream_event *);
+ void acknowledge_clef (Grob_info);
+ void acknowledge_bar_line (Grob_info);
};
void
{
}
-Key_engraver::Key_engraver ()
+Key_engraver::Key_engraver (Context *c)
+ : Engraver (c)
{
key_event_ = 0;
item_ = 0;
item_->set_property ("c0-position",
get_property ("middleCClefPosition"));
- SCM last = get_property ("lastKeySignature");
- SCM key = get_property ("keySignature");
+ SCM last = get_property ("lastKeyAlterations");
+ SCM key = get_property ("keyAlterations");
if ((to_boolean (get_property ("printKeyCancellation"))
- || key == SCM_EOL)
+ || scm_is_null (key))
&& !scm_is_eq (last, key))
{
SCM restore = SCM_EOL;
{
SCM new_alter_pair = scm_assoc (scm_caar (s), key);
Rational old_alter = robust_scm2rational (scm_cdar (s), 0);
- if (new_alter_pair == SCM_BOOL_F
+ if (scm_is_false (new_alter_pair)
|| ((ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter) * old_alter
< Rational (0)))
{
cancellation_->set_property ("alteration-alist", restore);
cancellation_->set_property ("c0-position",
- get_property ("middleCPosition"));
+ get_property ("middleCClefPosition"));
}
}
{
SCM visibility = get_property ("explicitKeySignatureVisibility");
item_->set_property ("break-visibility", visibility);
+ item_->set_property ("non-default", SCM_BOOL_T);
}
}
-IMPLEMENT_TRANSLATOR_LISTENER (Key_engraver, key_change);
void
Key_engraver::listen_key_change (Stream_event *ev)
{
void
Key_engraver::acknowledge_bar_line (Grob_info /* info */)
{
- if (scm_is_pair (get_property ("keySignature")))
- create_key (true);
+ create_key (true);
}
void
Key_engraver::process_music ()
{
if (key_event_
- || get_property ("lastKeySignature") != get_property ("keySignature"))
+ || !scm_is_eq (get_property ("lastKeyAlterations"),
+ get_property ("keyAlterations")))
create_key (false);
}
Key_engraver::stop_translation_timestep ()
{
item_ = 0;
- context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+ context ()->set_property ("lastKeyAlterations", get_property ("keyAlterations"));
cancellation_ = 0;
key_event_ = 0;
}
r->origin ()->warning (_ ("Incomplete keyAlterationOrder for key signature"));
}
- context ()->set_property ("keySignature", scm_reverse_x (accs, SCM_EOL));
+ context ()->set_property ("keyAlterations", scm_reverse_x (accs, SCM_EOL));
context ()->set_property ("tonic",
r->get_property ("tonic"));
}
void
Key_engraver::initialize ()
{
- context ()->set_property ("keySignature", SCM_EOL);
- context ()->set_property ("lastKeySignature", SCM_EOL);
+ context ()->set_property ("keyAlterations", SCM_EOL);
+ context ()->set_property ("lastKeyAlterations", SCM_EOL);
- Pitch p (0, 0, 0);
+ Pitch p;
context ()->set_property ("tonic", p.smobbed_copy ());
}
-ADD_ACKNOWLEDGER (Key_engraver, clef);
-ADD_ACKNOWLEDGER (Key_engraver, bar_line);
+
+void
+Key_engraver::boot ()
+{
+ ADD_LISTENER (Key_engraver, key_change);
+ ADD_ACKNOWLEDGER (Key_engraver, clef);
+ ADD_ACKNOWLEDGER (Key_engraver, bar_line);
+}
ADD_TRANSLATOR (Key_engraver,
/* doc */
"explicitKeySignatureVisibility "
"extraNatural "
"keyAlterationOrder "
- "keySignature "
- "lastKeySignature "
+ "keyAlterations "
+ "lastKeyAlterations "
"printKeyCancellation "
"middleCClefPosition ",
/* write */
- "keySignature "
- "lastKeySignature "
+ "keyAlterations "
+ "lastKeyAlterations "
"tonic "
);