From e75f38b1a9adaf7752ced683fff0e6ec01bd8a13 Mon Sep 17 00:00:00 2001 From: Mike Solomon Date: Fri, 12 Aug 2011 00:38:47 +0200 Subject: [PATCH] Allows multi measure rests' staff position to be set at 0. MultiMeasureRest grobs are only shifted if their staff position is unset. --- .../regression/multi-measure-rest-staff-position.ly | 12 ++++++++++++ lily/multi-measure-rest.cc | 2 +- scm/define-grobs.scm | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 input/regression/multi-measure-rest-staff-position.ly diff --git a/input/regression/multi-measure-rest-staff-position.ly b/input/regression/multi-measure-rest-staff-position.ly new file mode 100644 index 0000000000..c8d94f9d4e --- /dev/null +++ b/input/regression/multi-measure-rest-staff-position.ly @@ -0,0 +1,12 @@ +\version "2.15.9" + +\header { + texidoc = "Multi measure rest staff position can be overridden +to 0. +" +} + +\relative c' { + \override MultiMeasureRest #'staff-position = #0 + R1 +} diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 17a7a4277a..72a509cffa 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -217,7 +217,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) if (measure_count == 1) { Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true)); - if (mdl == 0 && Staff_symbol_referencer::get_position (me) == 0.0) + if (mdl == 0 && me->get_property ("staff-position") == SCM_EOL) s.translate_axis (staff_space, Y_AXIS); s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 2cfc11ab52..ff792baedb 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1309,7 +1309,6 @@ (padding . 1) (spacing-pair . (break-alignment . break-alignment)) (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods) - (staff-position . 0) (stencil . ,ly:multi-measure-rest::print) (thick-thickness . 6.6) ;; See Wanske pp. 125 -- 2.39.5