* lily/multi-measure-rest.cc (set_spacing_rods): Handle the

	minumum-length property correctly.

diff --git a/ChangeLog b/ChangeLog
index ad6b94d19ff76c6d20bd4f87476a9f2b8cdb6855..0fa3357f47571b2cc90758b0b962bf70348eade8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-01  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
+
+       * lily/multi-measure-rest.cc (set_spacing_rods): Handle the
+       minumum-length property correctly.
+
 2003-03-31  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scm/music-functions.scm (make-multi-measure-rest): set input

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 4de06c3f0ae7f9f131ceb577d1320441501ddb7d..9f6d693531f872fc4cce79cae97e087520d4ceb5 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -332,6 +332,8 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
       rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
        + sym_width  + 2.0;                     // 2.0 = magic!
   
+      rod.distance_ = max(rod.distance_,
+                         gh_scm2double (me->get_grob_property ("minimum-length")));
       rod.add_to_cols ();
     }
   return SCM_UNSPECIFIED;
@@ -342,5 +344,5 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
 
 ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface",
               "A rest that spans a whole number of measures.",
-              "expand-limit measure-count hair-thickness thick-thickness use-breve-rest");
+              "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length");
 

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index bc66de7186a8f0c2bb93094cc7c40939ca68ef87..2d153f6da2bbc094182d12d9ed0481f3e47aeb05 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -567,7 +567,7 @@
        (thick-thickness . 6.6)
        (hair-thickness . 2.0)
        (padding . 1)
-       (meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface spanner-interface))))
+       (meta . ((interfaces . (multi-measure-rest-interface rest-interface font-interface staff-symbol-referencer-interface))))
        ))
     
     (MultiMeasureRestNumber