Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / timing-translator.cc

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index f98ac23c2fc1af222789727a764559ca8c661ffa..a7f986fb1089deae7cd017fbd14492f3c9824f31 100644 (file)
--- 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 <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"
@@ -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);
+       }
     }
 }
 
@@ -50,7 +59,7 @@ Timing_translator::initialize ()
   */
   context ()->set_property ("measureLength",
                            Moment (Rational (1)).smobbed_copy ());
-  context ()->set_property ("beatLength",
+  context ()->set_property ("baseMoment",
                            Moment (Rational (1, 4)).smobbed_copy ());
 }
 
@@ -125,22 +134,27 @@ 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 ",
 
-               "internalBarNumber "
+               /* write */
+               "baseMoment "
                "currentBarNumber "
+               "internalBarNumber "
+               "measureLength "
                "measurePosition "
+               "timeSignatureFraction "
                );