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"
#include "clef.hh"
#include "pitch.hh"
+#include "translator.icc"
+
/*
TODO: The representation of key sigs is all fucked.
*/
class Key_engraver : public Engraver
{
void create_key (bool);
- void read_ev (Music const *r);
+ void read_event (Music const *r);
- Music *key_ev_;
+ Music *key_event_;
Item *item_;
Item *cancellation_;
public:
protected:
virtual void initialize ();
virtual void finalize ();
- virtual bool try_music (Music *ev);
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
- PRECOMPUTED_VIRTUAL void process_music ();
+ virtual bool try_music (Music *event);
+ void stop_translation_timestep ();
+ void process_music ();
- DECLARE_ACKNOWLEDGER(clef);
- DECLARE_ACKNOWLEDGER(bar_line);
-
+ DECLARE_ACKNOWLEDGER (clef);
+ DECLARE_ACKNOWLEDGER (bar_line);
};
void
Key_engraver::Key_engraver ()
{
- key_ev_ = 0;
+ key_event_ = 0;
item_ = 0;
cancellation_ = 0;
}
void
-Key_engraver::create_key (bool def)
+Key_engraver::create_key (bool is_default)
{
if (!item_)
{
- item_ = make_item ("KeySignature", key_ev_ ? key_ev_->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_ev_ ? key_ev_->self_scm () : SCM_EOL);
- cancellation_->set_property ("old-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 ("new-accidentals", key);
+ item_->set_property ("alteration-alist", key);
}
- if (!def)
+ if (!is_default)
{
- SCM vis = get_property ("explicitKeySignatureVisibility");
- if (ly_is_procedure (vis))
- item_->set_property ("break-visibility", vis);
+ SCM visibility = get_property ("explicitKeySignatureVisibility");
+ item_->set_property ("break-visibility", visibility);
+ if (cancellation_)
+ cancellation_->set_property ("break-visibility", visibility);
}
}
bool
-Key_engraver::try_music (Music *ev)
+Key_engraver::try_music (Music *event)
{
- if (ev->is_mus_type ("key-change-event"))
+ if (event->is_mus_type ("key-change-event"))
{
/* do this only once, just to be on the safe side. */
- if (!key_ev_)
+ if (!key_event_)
{
- key_ev_ = ev;
- read_ev (key_ev_);
+ key_event_ = event;
+ read_event (key_event_);
}
return true;
}
(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
Key_engraver::process_music ()
{
- if (key_ev_
+ if (key_event_
|| get_property ("lastKeySignature") != get_property ("keySignature"))
create_key (false);
}
item_ = 0;
context ()->set_property ("lastKeySignature", get_property ("keySignature"));
cancellation_ = 0;
- key_ev_ = 0;
+ key_event_ = 0;
}
void
-Key_engraver::read_ev (Music const *r)
+Key_engraver::read_event (Music const *r)
{
SCM p = r->get_property ("pitch-alist");
if (!scm_is_pair (p))
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 ());
}
-#include "translator.icc"
+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 ")