/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 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 "warn.hh"
#include "translator-group.hh"
#include "global-context.hh"
+#include "moment.hh"
+#include "lily-imports.hh"
void
Timing_translator::stop_translation_timestep ()
void
Timing_translator::initialize ()
{
- Context *timing = unsmob_context (scm_call_2 (ly_lily_module_constant ("ly:context-find"),
- context ()->self_scm (),
- ly_symbol2scm ("Timing")));
+ Context *timing = unsmob<Context>
+ (Lily::ly_context_find (context ()->self_scm (), ly_symbol2scm ("Timing")));
if (timing != context ())
{
context ()->add_alias (ly_symbol2scm ("Timing"));
context ()->set_property ("currentBarNumber", barnumber);
context ()->set_property ("internalBarNumber", barnumber);
- context ()->set_property ("timeSignatureFraction",
- timing->get_property ("timeSignatureFraction"));
+ SCM timeSignatureFraction = timing->get_property ("timeSignatureFraction");
+
+ if (!scm_is_pair (timeSignatureFraction))
+ {
+ programming_error ("missing timeSignatureFraction");
+ timeSignatureFraction = scm_cons (scm_from_int (4), scm_from_int (4));
+ }
+ context ()->set_property ("timeSignatureFraction", timeSignatureFraction);
+
+ SCM measureLength = timing->get_property ("measureLength");
+
+ if (!unsmob<Moment> (measureLength))
+ {
+ measureLength =
+ Moment (ly_scm2rational
+ (scm_divide (scm_car (timeSignatureFraction),
+ scm_cdr (timeSignatureFraction)))).smobbed_copy ();
+ }
+ context ()->set_property ("measureLength", measureLength);
+
/*
Do not init measurePosition; this should be done from global
context.
*/
- context ()->set_property ("measureLength",
- timing->get_property ("measureLength"));
- context ()->set_property ("baseMoment",
- timing->get_property ("baseMoment"));
+
+ SCM timeSignatureSettings = timing->get_property ("timeSignatureSettings");
+ if (!scm_is_pair (timeSignatureSettings))
+ {
+ programming_error ("missing timeSignatureSettings");
+ timeSignatureSettings = Lily::default_time_signature_settings;
+ }
+ context ()->set_property ("timeSignatureSettings", timeSignatureSettings);
+
+ SCM beamExceptions = timing->get_property ("beamExceptions");
+ if (!scm_is_pair (beamExceptions))
+ {
+ beamExceptions = Lily::beam_exceptions (timeSignatureFraction,
+ timeSignatureSettings);
+ }
+ context ()->set_property ("beamExceptions", beamExceptions);
+
+ SCM baseMoment = timing->get_property ("baseMoment");
+ if (!unsmob<Moment> (baseMoment))
+ {
+ baseMoment =
+ Moment (ly_scm2rational
+ (Lily::base_length (timeSignatureFraction,
+ timeSignatureSettings))).smobbed_copy ();
+ }
+ context ()->set_property ("baseMoment", baseMoment);
+
+ SCM beatStructure = timing->get_property ("beatStructure");
+ if (!scm_is_pair (beatStructure))
+ {
+ beatStructure =
+ Lily::beat_structure (ly_rational2scm (unsmob<Moment> (baseMoment)->main_part_),
+ timeSignatureFraction,
+ timeSignatureSettings);
+ }
+ context ()->set_property ("beatStructure", beatStructure);
+
+ context ()->set_property ("beamHalfMeasure",
+ timing->get_property ("beamHalfMeasure"));
+
+ context ()->set_property ("autoBeaming",
+ timing->get_property ("autoBeaming"));
}
Rational
Timing_translator::measure_length () const
{
SCM l = get_property ("measureLength");
- if (unsmob_moment (l))
- return unsmob_moment (l)->main_part_;
+ if (unsmob<Moment> (l))
+ return unsmob<Moment> (l)->main_part_;
else
return Rational (1);
}
-Timing_translator::Timing_translator ()
+Timing_translator::Timing_translator (Context *c)
+ : Translator (c)
{
}
Moment measposp;
SCM s = get_property ("measurePosition");
- if (unsmob_moment (s))
- measposp = *unsmob_moment (s);
+ if (unsmob<Moment> (s))
+ measposp = *unsmob<Moment> (s);
else
{
measposp = now;
- context ()->set_property ("measurePosition",
- measposp.smobbed_copy ());
}
- measposp += dt;
-
int current_barnumber = robust_scm2int (get_property ("currentBarNumber"), 0);
int internal_barnumber = robust_scm2int (get_property ("internalBarNumber"), 0);
SCM cad = get_property ("timing");
bool c = to_boolean (cad);
- Rational len = measure_length ();
- while (c && measposp.main_part_ >= len)
+ if (c)
{
- measposp.main_part_ -= len;
- current_barnumber++;
- internal_barnumber++;
+ Rational len = measure_length ();
+
+ measposp += dt;
+
+ while (measposp.main_part_ >= len)
+ {
+ measposp.main_part_ -= len;
+ current_barnumber++;
+ internal_barnumber++;
+ }
}
+
+ // Because "timing" can be switched on and off asynchronously with
+ // graces, measurePosition might get into strange settings of
+ // grace_part_. It does not actually make sense to have it diverge
+ // from the main timing. Updating the grace part outside of the
+ // actual check for "timing" looks strange and will lead to changes
+ // of grace_part_ even when timing is off. However, when timing is
+ // switched back on again, this will generally happen in an override
+ // that does _not_ in itself advance current_moment. So the whole
+ // timing advance logic will only get triggered while "timing" is
+ // still of. Maybe we should keep measurePosition.grace_part_
+ // constantly at zero anyway?
+
+ measposp.grace_part_ = now.grace_part_;
+
+
context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber));
context ()->set_property ("internalBarNumber", scm_from_int (internal_barnumber));
context ()->set_property ("measurePosition", measposp.smobbed_copy ());
#include "translator.icc"
+void
+Timing_translator::boot ()
+{
+
+}
+
ADD_TRANSLATOR (Timing_translator,
/* doc */
"This engraver adds the alias @code{Timing} to its containing"