/*
- timing-translator.cc -- implement Timing_translator
+ This file is part of LilyPond, the GNU music typesetter.
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- source file of the GNU LilyPond music typesetter
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "timing-translator.hh"
#include "warn.hh"
#include "translator-group.hh"
#include "global-context.hh"
-#include "multi-measure-rest.hh"
void
Timing_translator::stop_translation_timestep ()
Moment barleft = (measure_length () - measure_position (context ()));
Moment now = now_mom ();
- if (barleft > Moment (0)
- /*
- Hmm. We insert the bar moment every time we process a
- moment. A waste of cpu?
- */
- && !now.grace_part_)
- global->add_moment_to_process (now + barleft);
+ if (barleft > Moment (0))
+ {
+ Moment nextmom = now + barleft;
+ nextmom.grace_part_ = Rational (0);
+ global->add_moment_to_process (nextmom);
+ }
}
}
{
context ()->add_alias (ly_symbol2scm ("Timing"));
context ()->set_property ("currentBarNumber", scm_from_int (1));
+ context ()->set_property ("internalBarNumber", scm_from_int (1));
context ()->set_property ("timeSignatureFraction",
scm_cons (scm_from_int (4), scm_from_int (4)));
*/
context ()->set_property ("measureLength",
Moment (Rational (1)).smobbed_copy ());
- context ()->set_property ("beatLength",
+ context ()->set_property ("baseMoment",
Moment (Rational (1, 4)).smobbed_copy ());
}
measposp += dt;
- SCM barn = get_property ("currentBarNumber");
- int b = 0;
- if (scm_is_number (barn))
- b = scm_to_int (barn);
+ 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);
while (c && measposp.main_part_ >= len)
{
measposp.main_part_ -= len;
- b++;
+ current_barnumber ++;
+ internal_barnumber ++;
}
- context ()->set_property ("currentBarNumber", scm_from_int (b));
+ 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"
ADD_TRANSLATOR (Timing_translator,
- "This engraver adds the alias "
- "@code{Timing} to its containing context."
- "Responsible for synchronizing timing information from staves. "
- "Normally in @code{Score}. In order to create polyrhythmic music, "
- "this engraver should be removed from @code{Score} and placed in "
- "@code{Staff}. "
- "\n\nThis engraver adds the alias @code{Timing} to its containing context.",
-
- "", "", "", "");
+ /* doc */
+ "This engraver adds the alias @code{Timing} to its containing"
+ " context. Responsible for synchronizing timing information"
+ " from staves. Normally in @code{Score}. In order to create"
+ " polyrhythmic music, this engraver should be removed from"
+ " @code{Score} and placed in @code{Staff}.",
+
+ /* create */
+ "",
+
+ /* read */
+ "internalBarNumber "
+ "currentBarNumber "
+ "measureLength "
+ "measurePosition ",
+
+ /* write */
+ "baseMoment "
+ "currentBarNumber "
+ "internalBarNumber "
+ "measureLength "
+ "measurePosition "
+ "timeSignatureFraction "
+ );