source file of the GNU LilyPond music typesetter
- (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "key-item.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
+
+#include "event.hh"
#include "item.hh"
-#include "bar.hh"
+#include "bar-line.hh"
#include "staff-symbol-referencer.hh"
-#include "translator-group.hh"
+#include "context.hh"
#include "engraver.hh"
#include "pitch.hh"
#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_l_;
- Item * item_p_;
+ void read_ev (Music const * r);
+ Music * key_ev_;
+ Item * item_;
public:
- TRANSLATOR_DECLARATIONS(Key_engraver);
+ TRANSLATOR_DECLARATIONS (Key_engraver);
protected:
virtual void initialize ();
virtual void finalize ();
- virtual bool try_music (Music *req_l);
+ virtual bool try_music (Music *ev);
virtual void stop_translation_timestep ();
virtual void start_translation_timestep ();
- virtual void create_grobs ();
+ virtual void process_music ();
virtual void acknowledge_grob (Grob_info);
};
Key_engraver::Key_engraver ()
{
- keyreq_l_ = 0;
- item_p_ = 0;
+ key_ev_ = 0;
+ item_ = 0;
}
void
Key_engraver::create_key (bool def)
{
- if (!item_p_)
+ if (!item_)
{
- item_p_ = new Item (get_property ("KeySignature"));
+ item_ = make_item ("KeySignature", key_ev_ ? key_ev_->self_scm () : SCM_EOL);
- item_p_->set_grob_property ("c0-position",
- get_property ("centralCPosition"));
+ item_->set_property ("c0-position",
+ get_property ("middleCPosition"));
- // todo: put this in basic props.
- item_p_->set_grob_property ("old-accidentals", get_property ("lastKeySignature"));
- item_p_->set_grob_property ("new-accidentals", get_property ("keySignature"));
-
- Staff_symbol_referencer::set_interface (item_p_);
- Key_item::set_interface (item_p_);
- announce_grob (item_p_,keyreq_l_);
+ if (to_boolean (get_property ("printKeyCancellation")))
+ item_->set_property ("old-accidentals", get_property ("lastKeySignature"));
+ item_->set_property ("new-accidentals", get_property ("keySignature"));
}
if (!def)
{
SCM vis = get_property ("explicitKeySignatureVisibility");
- if (gh_procedure_p (vis))
- item_p_->set_grob_property ("visibility-lambda",vis);
+ if (ly_c_procedure_p (vis))
+ item_->set_property ("break-visibility",vis);
}
}
bool
-Key_engraver::try_music (Music * req_l)
+Key_engraver::try_music (Music * ev)
{
- if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+ if (ev->is_mus_type ("key-change-event"))
{
- if (keyreq_l_ && !keyreq_l_->equal_b (kc))
+ /* do this only once, just to be on the safe side. */
+ if (!key_ev_)
{
- kc->origin ()->warning (_ ("Conflicting key signatures found."));
- keyreq_l_->origin ()->warning (_ ("This was the other key definition."));
- return false;
+ key_ev_ = ev;
+ read_ev (key_ev_);
}
- keyreq_l_ = kc;
- read_req (keyreq_l_);
-
return true;
}
return false;
void
Key_engraver::acknowledge_grob (Grob_info info)
{
- if (Clef::has_interface (info.grob_l_))
+ if (Clef::has_interface (info.grob_))
{
SCM c = get_property ("createKeyOnClefChange");
if (to_boolean (c))
create_key (false);
}
}
- else if (Bar::has_interface (info.grob_l_)
- && gh_pair_p (get_property ("keySignature")))
+ else if (Bar_line::has_interface (info.grob_)
+ && ly_c_pair_p (get_property ("keySignature")))
{
create_key (true);
}
void
-Key_engraver::create_grobs ()
+Key_engraver::process_music ()
{
- if (keyreq_l_ ||
+ if (key_ev_ ||
get_property ("lastKeySignature") != get_property ("keySignature"))
create_key (false);
}
void
Key_engraver::stop_translation_timestep ()
{
- if (item_p_)
- {
- typeset_grob (item_p_);
- item_p_ = 0;
- }
+ item_ = 0;
+ context ()->set_property ("lastKeySignature", get_property ("keySignature"));
}
void
-Key_engraver::read_req (Key_change_req const * r)
+Key_engraver::read_ev (Music const * r)
{
- SCM p = r->get_mus_property ("pitch-alist");
- if (!gh_pair_p (p))
+ SCM p = r->get_property ("pitch-alist");
+ if (!ly_c_pair_p (p))
return;
SCM n = scm_list_copy (p);
SCM accs = SCM_EOL;
for (SCM s = get_property ("keyAccidentalOrder");
- gh_pair_p (s); s = ly_cdr (s))
+ ly_c_pair_p (s); s = ly_cdr (s))
{
- if (gh_pair_p (scm_member (ly_car (s), n)))
+ if (ly_c_pair_p (scm_member (ly_car (s), n)))
{
- accs = gh_cons (ly_car (s), accs);
+ accs = scm_cons (ly_car (s), accs);
n = scm_delete_x (ly_car (s), n);
}
}
- for (SCM s = n ; gh_pair_p (s); s = ly_cdr (s))
- if (gh_scm2int (ly_cdar (s)))
- accs = gh_cons (ly_car (s), accs);
+ for (SCM s = n ; ly_c_pair_p (s); s = ly_cdr (s))
+ if (ly_scm2int (ly_cdar (s)))
+ accs = scm_cons (ly_car (s), accs);
- daddy_trans_l_->set_property ("lastKeySignature",
- get_property ("keySignature"));
- daddy_trans_l_->set_property ("keySignature", accs);
+ context ()->set_property ("keySignature", accs);
+ context ()->set_property ("tonic" ,
+ r->get_property ("tonic"));
}
void
Key_engraver::start_translation_timestep ()
{
- keyreq_l_ = 0;
- daddy_trans_l_->set_property ("lastKeySignature", get_property ("keySignature"));
+ key_ev_ = 0;
}
void
Key_engraver::initialize ()
{
- daddy_trans_l_->set_property ("keySignature", SCM_EOL);
- daddy_trans_l_->set_property ("lastKeySignature", SCM_EOL);
+ context ()->set_property ("keySignature", SCM_EOL);
+ context ()->set_property ("lastKeySignature", SCM_EOL);
+
+ Pitch p (0,0,0);
+ context ()->set_property ("tonic", p.smobbed_copy ());
+
}
-ENTER_DESCRIPTION(Key_engraver,
+ENTER_DESCRIPTION (Key_engraver,
/* descr */ "",
/* creats*/ "KeySignature",
-/* acks */ "bar-line-interface clef-interface",
-/* reads */ "keySignature lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
-/* write */ "lastKeySignature");
+/* accepts */ "key-change-event",
+/* acks */ "bar-line-interface clef-interface",
+/* reads */ "keySignature printKeyCancellation lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
+/* write */ "lastKeySignature tonic keySignature");
projects / lilypond.git / blobdiff