X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=1252c2e577dca1db80cebb4059651deb289b3635;hb=0e4883e95834d2692a0568e42d2fe697ae771c3a;hp=d7929181716a635177523b7c657afd935dd33d05;hpb=eb38d3262cc0c09668ecf330a792e6d1d95f6f8a;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index d792918171..1252c2e577 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -1,10 +1,20 @@ /* - timing-translator.cc -- implement Timing_translator + This file is part of LilyPond, the GNU music typesetter. + Copyright (C) 1997--2010 Han-Wen Nienhuys - 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 + 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 . */ #include "timing-translator.hh" @@ -25,13 +35,12 @@ 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); + } } } @@ -125,21 +134,23 @@ Timing_translator::start_translation_timestep () #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 */ "internalBarNumber " "currentBarNumber " "measurePosition "