From: Mats Bengtsson Date: Wed, 2 Apr 2003 12:30:45 +0000 (+0000) Subject: * lily/multi-measure-rest.cc (set_spacing_rods): Handle the X-Git-Tag: release/1.6.10~10 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=05ece525f56c7bece02bd7faa2904996eb96697b;p=lilypond.git * lily/multi-measure-rest.cc (set_spacing_rods): Handle the minumum-length property correctly. --- diff --git a/ChangeLog b/ChangeLog index d569c7d5df..61836ee830 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-02 Mats Bengtsson + + * lily/multi-measure-rest.cc (set_spacing_rods): Handle the + minumum-length property correctly. + 2003-03-30 Han-Wen Nienhuys * VERSION (MY_PATCH_LEVEL): 1.6.9 released diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 69d9ec64fe..ad6bb8a3e4 100644 --- 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 5545ffc8e5..138a2e2c35 100644 --- 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