X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-translator.cc;h=d5d069270bbed0b55d1b3b06eb719647315c9323;hb=a55cce88d24acb0903b95b2339f0160cee089665;hp=1252c2e577dca1db80cebb4059651deb289b3635;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 1252c2e577..d5d069270b 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--2010 Han-Wen Nienhuys + Copyright (C) 1997--2011 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 @@ -22,7 +22,6 @@ #include "warn.hh" #include "translator-group.hh" #include "global-context.hh" -#include "multi-measure-rest.hh" void Timing_translator::stop_translation_timestep () @@ -59,7 +58,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 ()); } @@ -151,7 +150,10 @@ ADD_TRANSLATOR (Timing_translator, "measurePosition ", /* write */ - "internalBarNumber " + "baseMoment " "currentBarNumber " + "internalBarNumber " + "measureLength " "measurePosition " + "timeSignatureFraction " );