From 429556f51bd3211e7a48babc3aaa24e5b29bf652 Mon Sep 17 00:00:00 2001 From: Mats Bengtsson Date: Tue, 1 Apr 2003 08:43:22 +0000 Subject: [PATCH] * lily/multi-measure-rest.cc (set_spacing_rods): Handle the minumum-length property correctly. --- ChangeLog | 5 +++++ lily/multi-measure-rest.cc | 4 +++- scm/grob-description.scm | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad6b94d19f..0fa3357f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-01 Mats Bengtsson + + * lily/multi-measure-rest.cc (set_spacing_rods): Handle the + minumum-length property correctly. + 2003-03-31 Han-Wen Nienhuys * 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 4de06c3f0a..9f6d693531 100644 --- 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 bc66de7186..2d153f6da2 100644 --- 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 -- 2.39.2