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

	minumum-length property correctly.

diff --git a/ChangeLog b/ChangeLog
index d569c7d5df39a8804c79ef6514dc18f9e1f26303..61836ee830d5e0041bfdb3739920cf7ccba8af79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-02  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
+
+       * lily/multi-measure-rest.cc (set_spacing_rods): Handle the
+       minumum-length property correctly.
+
 2003-03-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * VERSION (MY_PATCH_LEVEL): 1.6.9 released 

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 69d9ec64feee7bded5785d550a45d4450717d427..ad6bb8a3e48f8422c2d39921ea43004192d70a1a 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -320,6 +320,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;
@@ -333,4 +335,4 @@ numbers, fields from font-interface may be used.
 
 
 ",
-  "expand-limit measure-count number-threshold padding thickness");
+  "expand-limit measure-count number-threshold padding thickness minimum-length");

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 5545ffc8e5280ad8bf6bf3c159c0c5ce10da0a88..138a2e2c358091fcc624bf6839b795179890b957 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -530,7 +530,7 @@
        (thickness . 6.6)
        (font-family . number)
        (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))))
        ))
 
     (NoteCollision