source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "protected-scm.hh"
#include "clef.hh"
+/*
+ TODO: The representation of key sigs is all fucked.
+ */
+
/**
Make the key signature.
*/
class Key_engraver : public Engraver
{
void create_key (bool);
- void read_req (Key_change_req const * r);
- Key_change_req * keyreq_;
+ void read_ev (Key_change_ev const * r);
+ Key_change_ev * key_ev_;
Item * item_;
public:
protected:
virtual void initialize ();
virtual void finalize ();
- virtual bool try_music (Music *req);
+ virtual bool try_music (Music *ev);
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
virtual void process_music ();
Key_engraver::Key_engraver ()
{
- keyreq_ = 0;
+ key_ev_ = 0;
item_ = 0;
}
{
if (!item_)
{
- item_ = new Item (get_property ("KeySignature"));
+ item_ = make_item ("KeySignature");
item_->set_grob_property ("c0-position",
get_property ("centralCPosition"));
item_->set_grob_property ("old-accidentals", get_property ("lastKeySignature"));
item_->set_grob_property ("new-accidentals", get_property ("keySignature"));
- announce_grob(item_, keyreq_ ? keyreq_->self_scm() : SCM_EOL);
+ announce_grob(item_, key_ev_ ? key_ev_->self_scm() : SCM_EOL);
}
if (!def)
bool
-Key_engraver::try_music (Music * req)
+Key_engraver::try_music (Music * ev)
{
- if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
+ // if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (ev))
+ if (ev->is_mus_type ("key-change-event"))
{
- if (!keyreq_)
+ if (!key_ev_)
{
/*
do this only once, just to be on the safe side.
*/
- keyreq_ = kc;
- read_req (keyreq_);
+ key_ev_ = dynamic_cast<Key_change_ev*> (ev); // UGH.
+ read_ev (key_ev_);
}
return true;
void
Key_engraver::process_music ()
{
- if (keyreq_ ||
+ if (key_ev_ ||
get_property ("lastKeySignature") != get_property ("keySignature"))
create_key (false);
}
void
-Key_engraver::read_req (Key_change_req const * r)
+Key_engraver::read_ev (Key_change_ev const * r)
{
SCM p = r->get_mus_property ("pitch-alist");
if (!gh_pair_p (p))
if (gh_scm2int (ly_cdar (s)))
accs = gh_cons (ly_car (s), accs);
-#if 0
- daddy_trans_->set_property ("lastKeySignature",
- get_property ("keySignature"));
-#endif
-
daddy_trans_->set_property ("keySignature", accs);
+ daddy_trans_->set_property ("tonic" ,
+ r->get_mus_property ("tonic"));
}
void
Key_engraver::start_translation_timestep ()
{
- keyreq_ = 0;
+ key_ev_ = 0;
daddy_trans_->set_property ("lastKeySignature", get_property ("keySignature"));
}
{
daddy_trans_->set_property ("keySignature", SCM_EOL);
daddy_trans_->set_property ("lastKeySignature", SCM_EOL);
+
+ Pitch p(0,0,0);
+ daddy_trans_->set_property ("tonic", p.smobbed_copy ());
+
}
/* accepts */ "key-change-event",
/* acks */ "bar-line-interface clef-interface",
/* reads */ "keySignature lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
-/* write */ "lastKeySignature");
+/* write */ "lastKeySignature tonic keySignature");