Imported Upstream version 2.14.2

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

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 57998ace963d654a45cb598a5b8e6933556d3f24..d5d069270bbed0b55d1b3b06eb719647315c9323 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--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--2009 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"
@@ -12,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 ()
@@ -49,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 ());
 }
 
@@ -141,7 +150,10 @@ ADD_TRANSLATOR (Timing_translator,
                "measurePosition ",
 
                /* write */
-               "internalBarNumber "
+               "baseMoment "
                "currentBarNumber "
+               "internalBarNumber "
+               "measureLength "
                "measurePosition "
+               "timeSignatureFraction "
                );