X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=8d456b2d38d537169ee94faa9163e17addd74d33;hb=e8bb4dcdf244ccda234b63df0a78635cf066be4c;hp=d5d069270bbed0b55d1b3b06eb719647315c9323;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index d5d069270b..8d456b2d38 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,11 +35,11 @@ Timing_translator::stop_translation_timestep () Moment now = now_mom (); if (barleft > Moment (0)) - { - Moment nextmom = now + barleft; - nextmom.grace_part_ = Rational (0); - global->add_moment_to_process (nextmom); - } + { + Moment nextmom = now + barleft; + nextmom.grace_part_ = Rational (0); + global->add_moment_to_process (nextmom); + } } } @@ -51,15 +51,15 @@ Timing_translator::initialize () context ()->set_property ("internalBarNumber", scm_from_int (1)); context ()->set_property ("timeSignatureFraction", - scm_cons (scm_from_int (4), scm_from_int (4))); + scm_cons (scm_from_int (4), scm_from_int (4))); /* Do not init measurePosition; this should be done from global context. */ context ()->set_property ("measureLength", - Moment (Rational (1)).smobbed_copy ()); + Moment (Rational (1)).smobbed_copy ()); context ()->set_property ("baseMoment", - Moment (Rational (1, 4)).smobbed_copy ()); + Moment (Rational (1, 4)).smobbed_copy ()); } Rational @@ -106,7 +106,7 @@ Timing_translator::start_translation_timestep () { measposp = now; context ()->set_property ("measurePosition", - measposp.smobbed_copy ()); + measposp.smobbed_copy ()); } measposp += dt; @@ -121,8 +121,8 @@ Timing_translator::start_translation_timestep () while (c && measposp.main_part_ >= len) { measposp.main_part_ -= len; - current_barnumber ++; - internal_barnumber ++; + current_barnumber++; + internal_barnumber++; } context ()->set_property ("currentBarNumber", scm_from_int (current_barnumber)); @@ -133,27 +133,27 @@ Timing_translator::start_translation_timestep () #include "translator.icc" ADD_TRANSLATOR (Timing_translator, - /* 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 " - ); + /* 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 " + );