/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "misc.hh"
#include "moment.hh"
#include "stream-event.hh"
-#include "time-signature.hh"
#include "warn.hh"
#include "translator.icc"
void process_music ();
public:
TRANSLATOR_DECLARATIONS (Time_signature_engraver);
- DECLARE_TRANSLATOR_LISTENER (time_signature);
+ void listen_time_signature (Stream_event *);
};
void
scm_gc_mark (time_cause_);
}
-Time_signature_engraver::Time_signature_engraver ()
+Time_signature_engraver::Time_signature_engraver (Context *c)
+ : Engraver (c)
{
time_signature_ = 0;
time_cause_ = SCM_EOL;
last_time_fraction_ = SCM_BOOL_F;
}
-IMPLEMENT_TRANSLATOR_LISTENER (Time_signature_engraver, time_signature);
void
Time_signature_engraver::listen_time_signature (Stream_event *ev)
{
return;
SCM fr = get_property ("timeSignatureFraction");
- if (last_time_fraction_ != fr
- && scm_is_pair (fr))
+ if (!scm_is_eq (last_time_fraction_, fr) && scm_is_pair (fr))
{
time_signature_ = make_item ("TimeSignature", time_cause_);
time_signature_->set_property ("fraction", fr);
- // Todo: "implicit" does not seem perfectly accurate (issue 4151)
- if (last_time_fraction_ == SCM_BOOL_F)
+ if (scm_is_false (last_time_fraction_))
time_signature_->set_property ("break-visibility",
- get_property ("implicitTimeSignatureVisibility"));
+ get_property ("initialTimeSignatureVisibility"));
int den = scm_to_int (scm_cdr (fr));
if (den != (1 << intlog2 (den)))
void
Time_signature_engraver::stop_translation_timestep ()
{
- if (time_signature_ && (time_cause_ != SCM_EOL))
+ if (time_signature_ && !scm_is_null (time_cause_))
{
- Moment *mp = Moment::unsmob (get_property ("measurePosition"));
+ Moment *mp = unsmob<Moment> (get_property ("measurePosition"));
if (mp && (mp->main_part_ > Rational (0))
&& !to_boolean (get_property ("partialBusy")))
time_signature_->warning ("mid-measure time signature without \\partial");
time_cause_ = SCM_EOL;
}
-#include "translator.icc"
+void
+Time_signature_engraver::boot ()
+{
+ ADD_LISTENER (Time_signature_engraver, time_signature);
+}
ADD_TRANSLATOR (Time_signature_engraver,
/* doc */
"TimeSignature ",
/* read */
- "implicitTimeSignatureVisibility "
+ "initialTimeSignatureVisibility "
"partialBusy "
"timeSignatureFraction ",