Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / lily / multi-measure-rest-engraver.cc

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index fa84af9c4bf85563a9048532441d01a00dbf43c8..786ab143c14957c8896542f9cd898e44e2bd6327 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,8 +1,21 @@
 /*
-  multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  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.
+
+  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 "multi-measure-rest.hh"
@@ -215,11 +228,6 @@ Multi_measure_rest_engraver::start_translation_timestep ()
       */
       last_rest_->set_property ("measure-count", scm_from_int (num));
 
-      SCM sml = get_property ("measureLength");
-      Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1);
-      if (ml >= Rational (2))
-       last_rest_->set_property ("use-breve-rest", SCM_BOOL_T);
-
       mmrest_ = 0;
       numbers_.clear ();
 
@@ -255,9 +263,7 @@ ADD_TRANSLATOR (Multi_measure_rest_engraver,
                "Engrave multi-measure rests that are produced with"
                " @samp{R}.  It reads @code{measurePosition} and"
                " @code{internalBarNumber} to determine what number to print"
-               " over the @ref{MultiMeasureRest}.  Reads @code{measureLength}"
-               " to determine whether it should use a whole rest or a breve"
-               " rest to represent one measure.",
+               " over the @ref{MultiMeasureRest}.",
                
                /* create */
                "MultiMeasureRest "
@@ -267,10 +273,8 @@ ADD_TRANSLATOR (Multi_measure_rest_engraver,
                /* read */
                "internalBarNumber "
                "restNumberThreshold "
-               "breakableSeparationItem "
                "currentCommandColumn "
-               "measurePosition "
-               "measureLength ",
+               "measurePosition ",
                
                /* write */
                ""