/*
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 "item.hh"
#include "international.hh"
#include "misc.hh"
-#include "time-signature.hh"
+#include "moment.hh"
+#include "stream-event.hh"
#include "warn.hh"
+#include "translator.icc"
+
/**
generate time_signatures.
*/
{
Item *time_signature_;
SCM last_time_fraction_;
+ SCM time_cause_;
protected:
virtual void derived_mark () const;
void process_music ();
public:
TRANSLATOR_DECLARATIONS (Time_signature_engraver);
+ DECLARE_TRANSLATOR_LISTENER (time_signature);
};
void
Time_signature_engraver::derived_mark () const
{
scm_gc_mark (last_time_fraction_);
+ scm_gc_mark (time_cause_);
}
Time_signature_engraver::Time_signature_engraver ()
{
time_signature_ = 0;
+ time_cause_ = SCM_EOL;
last_time_fraction_ = SCM_BOOL_F;
}
+void
+Time_signature_engraver::listen_time_signature (Stream_event *ev)
+{
+ time_cause_ = ev->self_scm ();
+}
+
void
Time_signature_engraver::process_music ()
{
- /*
- not rigorously safe, since the value might get GC'd and
- reallocated in the same spot */
+ if (time_signature_)
+ return;
+
SCM fr = get_property ("timeSignatureFraction");
- if (!time_signature_
- && last_time_fraction_ != fr
+ if (last_time_fraction_ != fr
&& scm_is_pair (fr))
{
+ time_signature_ = make_item ("TimeSignature", time_cause_);
+ time_signature_->set_property ("fraction", fr);
+
+ if (scm_is_false (last_time_fraction_))
+ time_signature_->set_property ("break-visibility",
+ get_property ("initialTimeSignatureVisibility"));
+
int den = scm_to_int (scm_cdr (fr));
if (den != (1 << intlog2 (den)))
{
OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
*/
- warning (_f ("strange time signature found: %d/%d",
- int (scm_to_int (scm_car (fr))),
- den));
+ time_signature_->warning (_f ("strange time signature found: %d/%d",
+ int (scm_to_int (scm_car (fr))),
+ den));
}
- time_signature_ = make_item ("TimeSignature", SCM_EOL);
- time_signature_->set_property ("fraction", fr);
-
- if (last_time_fraction_ == SCM_BOOL_F)
- time_signature_->set_property ("break-visibility",
- get_property ("implicitTimeSignatureVisibility"));
-
last_time_fraction_ = fr;
}
}
void
Time_signature_engraver::stop_translation_timestep ()
{
+ if (time_signature_ && !scm_is_null (time_cause_))
+ {
+ 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_signature_ = 0;
+ 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 ",
/* write */