Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 8afc6414397afcc7b716cf81b7dcf53119fc996f..d16a11e3dbddd9ba2655f44a7c79e67809477f37 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -307,8 +307,7 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
       rod.item_drul_[LEFT] = li;
       rod.item_drul_[RIGHT] = ri;
 
-      rod.distance_ = li->extent (li, X_AXIS)[BIGGER]
-       - ri->extent (ri, X_AXIS)[SMALLER]
+      rod.distance_ = Paper_column::minimum_distance (li, ri)
        + length
        + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0);
 
@@ -355,5 +354,6 @@ ADD_INTERFACE (Multi_measure_rest,
               "thick-thickness "
               "use-breve-rest "
               "bound-padding "
-              "minimum-length");
+              "minimum-length "
+              );