X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=d94518db3abc5427327a6caeb5e0cc660f40def4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8afc6414397afcc7b716cf81b7dcf53119fc996f;hpb=06c9c603c02f173189c4ba6289e61193633c6e85;p=lilypond.git

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 8afc641439..d94518db3a 100644
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "multi-measure-rest.hh"
@@ -47,7 +47,7 @@ Multi_measure_rest::percent (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
-  Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
+  Stencil r = Percent_repeat_item_interface::x_percent (me, 1);
 
   // ugh copy & paste.
 
@@ -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 "
+	       );