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 "bar-line.hh"
-#include "staff-symbol-referencer.hh"
+#include "clef.hh"
#include "context.hh"
#include "engraver.hh"
-#include "protected-scm.hh"
-#include "clef.hh"
+#include "item.hh"
#include "pitch.hh"
+#include "protected-scm.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
#include "translator.icc"
class Key_engraver : public Engraver
{
void create_key (bool);
- void read_event (Music const *r);
+ void read_event (Stream_event const *r);
- Music *key_event_;
+ Stream_event *key_event_;
Item *item_;
Item *cancellation_;
public:
protected:
virtual void initialize ();
virtual void finalize ();
- virtual bool try_music (Music *event);
void stop_translation_timestep ();
void process_music ();
+ DECLARE_TRANSLATOR_LISTENER (key_change);
DECLARE_ACKNOWLEDGER (clef);
DECLARE_ACKNOWLEDGER (bar_line);
};
|| key == SCM_EOL)
&& !scm_is_eq (last, key))
{
- cancellation_ = make_item ("KeyCancellation",
- key_event_
- ? key_event_->self_scm () : SCM_EOL);
-
SCM restore = SCM_EOL;
SCM *tail = &restore;
for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
{
*tail = scm_acons (scm_caar (s),
scm_from_int (0), *tail);
- tail = SCM_CDRLOC(*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 ("accidentals", restore);
- cancellation_->set_property ("c0-position",
- get_property ("middleCPosition"));
+ cancellation_->set_property ("alteration-alist", restore);
+ cancellation_->set_property ("c0-position",
+ get_property ("middleCPosition"));
+ }
}
- item_->set_property ("accidentals", key);
+ item_->set_property ("alteration-alist", key);
}
if (!is_default)
{
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 *event)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_engraver, key_change);
+void
+Key_engraver::listen_key_change (Stream_event *ev)
{
- if (event->is_mus_type ("key-change-event"))
- {
- /* do this only once, just to be on the safe side. */
- if (!key_event_)
- {
- key_event_ = event;
- read_event (key_event_);
- }
- return true;
- }
- return false;
+ /* do this only once, just to be on the safe side. */
+ if (ASSIGN_EVENT_ONCE (key_event_, ev))
+ read_event (key_event_);
}
void
(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
}
void
-Key_engraver::read_event (Music const *r)
+Key_engraver::read_event (Stream_event 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 ());
}
-
-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 ")