#include "key-item.hh"
#include "command-request.hh"
#include "musical-request.hh"
-#include "local-key-item.hh"
+#include "item.hh"
#include "bar.hh"
#include "timing-translator.hh"
#include "staff-symbol-referencer.hh"
#include "engraver.hh"
#include "musical-pitch.hh"
#include "protected-scm.hh"
-
+#include "clef.hh"
/**
Make the key signature.
*/
-class Key_engraver : public Engraver {
+class Key_engraver : public Engraver
+{
void create_key(bool);
void read_req (Key_change_req const * r);
protected:
virtual void do_creation_processing();
+ virtual void do_removal_processing ();
virtual bool do_try_music (Music *req_l);
virtual void do_process_music();
virtual void do_pre_move_processing();
};
+void
+Key_engraver::do_removal_processing ()
+{
+ old_accs_ = SCM_EOL; // unprotect can not be called from dtor.
+}
+
Key_engraver::Key_engraver ()
{
keyreq_l_ = 0;
item_p_->set_elt_property ("old-accidentals", old_accs_);
item_p_->set_elt_property ("new-accidentals", get_property ("keySignature"));
- Staff_symbol_referencer_interface::set_interface (item_p_);
+ 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_elt_property ("multi-octave", gh_bool2scm (multi));
- announce_element (Score_element_info (item_p_,keyreq_l_));
+ announce_element (item_p_,keyreq_l_);
}
- if (!def)
- item_p_->set_elt_property ("visibility-lambda",
- scm_eval (ly_symbol2scm ("all-visible")));
+ if (!def)
+ {
+ SCM vis = get_property ("explicitKeySignatureVisibility");
+ if (gh_procedure_p (vis))
+ item_p_->set_elt_property ("visibility-lambda",vis);
+ }
}
void
Key_engraver::acknowledge_element (Score_element_info info)
{
- if (to_boolean (info.elem_l_->get_elt_property ("clef-interface")))
+ if (Clef::has_interface (info.elem_l_))
{
SCM c = get_property ("createKeyOnClefChange");
if (to_boolean (c))
create_key (false);
}
}
- else if (dynamic_cast<Bar *> (info.elem_l_)
+ else if (Bar::has_interface (info.elem_l_)
&& gh_pair_p (get_property ("keySignature")))
{
create_key (true);
void
Key_engraver::read_req (Key_change_req const * r)
{
- if (r->pitch_alist_ == SCM_UNDEFINED)
+ SCM p = r->get_mus_property ("pitch-alist");
+ if (p == SCM_UNDEFINED)
return;
- SCM n = scm_list_copy (r->pitch_alist_);
+ SCM n = scm_list_copy (p);
SCM accs = SCM_EOL;
for (SCM s = get_property ("keyAccidentalOrder");
gh_pair_p (s); s = gh_cdr (s))