Fix 441.

Make the extra space for a full measure configurable.

diff --git a/input/regression/spacing-bar-whole-measure.ly b/input/regression/spacing-bar-whole-measure.ly
index c96228f619dba1ec55f96f8773586cad9f616c97..eac6426ea6f12ea5e1e62b3ada0e3afd5ebb644d 100644 (file)
--- 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 a6e7fa6a35fe38a1d945cc075ad5235aba0ac550..0112599371083d250512f8a83db356cf2a0b04aa 100644 (file)
--- 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 d5dcb01cc87ac8efb496038cdb96556638bf003e..446c1413cdbe984fc61ea411d0eb704d2ffee53e 100644 (file)
--- 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 3240912a1d79daf7d6bbf3202c37eb2842c41f69..4dd07b245b95a6164514f329f282e2656de1c6ee 100644 (file)
--- 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 d7ed47f363f5946bed4155b01c48bc1e9a964eb0..4187a386d39a8382d9513b2f1dd9b506b944af93 100644 (file)
--- 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)