From bd6fb0b2b29864ad1738beab50939c4f9e67e7e3 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Thu, 8 Jan 2009 13:28:55 +1100 Subject: [PATCH] Fix 441. Make the extra space for a full measure configurable. --- input/regression/spacing-bar-whole-measure.ly | 3 +++ lily/paper-column.cc | 1 + lily/spacing-spanner.cc | 3 ++- scm/define-grob-properties.scm | 4 +++- scm/define-grobs.scm | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/input/regression/spacing-bar-whole-measure.ly b/input/regression/spacing-bar-whole-measure.ly index c96228f619..eac6426ea6 100644 --- a/input/regression/spacing-bar-whole-measure.ly +++ b/input/regression/spacing-bar-whole-measure.ly @@ -19,4 +19,7 @@ \time 3/4 s2. c2. + \override Score.NonMusicalPaperColumn #'full-measure-extra-space = #3.0 + s2. + c2. } diff --git a/lily/paper-column.cc b/lily/paper-column.cc index a6e7fa6a35..0112599371 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -359,6 +359,7 @@ ADD_INTERFACE (Paper_column, /* properties */ "between-cols " "bounded-by-me " + "full-measure-extra-space " "grace-spacing " "labels " "line-break-system-details " diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index d5dcb01cc8..446c1413cd 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -513,7 +513,8 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, && l->break_status_dir () == CENTER && fills_measure (me, l, r)) { - spring.set_distance (spring.distance () + 1.0); + Real full_measure_extra_space = robust_scm2double (l->get_property ("full-measure-extra-space"), 1.0); + spring.set_distance (spring.distance () + full_measure_extra_space); spring.set_default_strength (); } diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 3240912a1d..4dd07b245b 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -381,7 +381,9 @@ circled pedals. Default value 0.15. @code{circle-y-padding} -- Padding in Y direction of the ellipse around circled pedals. Default value 0.2. @end itemize") - + (full-measure-extra-space ,number? "Extra space that is allocated at the +beginning of a measure with only one note. This property is read from the +NonMusicalPaperColumn that begins the measure.") (head-direction ,ly:dir? "Are the note heads left or right in a semitie?") (height ,ly:dimension? "Height of an object in diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index d7ed47f363..4187a386d3 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1152,6 +1152,7 @@ (non-musical . #t) (line-break-permission . allow) (page-break-permission . allow) + (full-measure-extra-space . 1.0) ;; debugging stuff: print column number. ;; (font-size . -6) (font-name . "sans") (Y-extent . #f) -- 2.39.5