Web: Aurélien Bello's Der Rosenkavalier

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index f2d1af5a62e1c4b20168b4593232a8390b99a1c6..e13d5bf17a33e799f8195879362d9efe3567b8f0 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -365,11 +365,13 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
       Moment mlen = robust_scm2moment (li->get_property ("measure-length"),
                                        Moment (1));
       length += robust_scm2double (li->get_property ("full-measure-extra-space"), 0.0)
-                + options.get_duration_space (mlen.main_part_);
+                + options.get_duration_space (mlen.main_part_)
+                + (robust_scm2double (me->get_property ("space-increment"), 0.0)
+                   * log_2 (robust_scm2int (me->get_property ("measure-count"), 1)));
     }
 
-  length += 2 * robust_scm2double (me->get_property ("bound-padding"), 0.0)
-            + 2 * robust_scm2double (me->get_property ("padding"), 0.0);
+  length += 2 * robust_scm2double (me->get_property ("bound-padding"), 0.0);
+
   Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0.0);
 
   Item *combinations[4][2] = {{li, ri},
@@ -432,9 +434,9 @@ ADD_INTERFACE (Multi_measure_rest,
                "hair-thickness "
                "measure-count "
                "minimum-length "
-               "padding "
                "round-up-exceptions "
                "round-up-to-longer-rest "
+               "space-increment "
                "spacing-pair "
                "thick-thickness "
                "usable-duration-logs "