Fixed spacing in space-alist; issue 1785

The 'fixed' distance was intended to limit compressibility.

diff --git a/input/regression/tablature-full-notation.ly b/input/regression/tablature-full-notation.ly
index 8e31540b88e0544b14969860bfe8bd8785217cbf..0b7e0646fdaea5fae057376310fbdefdcb474449 100644 (file)
--- a/input/regression/tablature-full-notation.ly
+++ b/input/regression/tablature-full-notation.ly
@@ -13,9 +13,8 @@ tabstuff = {
   f4\f g a^\fermata |
   R2.*3 |
   c8\<\( c16 c ~ c2\! |
-  c'2.\) |
   \mark \default
-  R2. |
+  c'2.\) |
   \ottava #1
   r4 d'4 r8 e |
   \ottava #0

diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc
index 00c9abd6dcf16828c55241e997bcb6da2c319bad..7c4ece46433c5f6be6477a52bc0d3d492d331f3f 100644 (file)
--- a/lily/staff-spacing.cc
+++ b/lily/staff-spacing.cc
@@ -214,6 +214,7 @@ Staff_spacing::get_spacing (Grob *me, Grob *right_col, Real situational_space)
 
   Spring ret (ideal, min_dist);
   ret.set_inverse_stretch_strength (max (0.0, stretchability));
+  ret.set_inverse_compress_strength (max (0.0, ideal - fixed));
   return ret;
 }
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 680f1598af68a6e07181e61d16b490e6e34c128d..2dbaa4c2e7709e7c9dd4afd78d15ebd4ab2fb32e 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1072,7 +1072,7 @@
                        (key-signature . (extra-space . 0.5))
                        (cue-clef . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))
-                       (first-note . (fixed-space . 2.5))))
+                       (first-note . (semi-fixed-space . 2.5))))
        (stencil . ,ly:key-signature-interface::print)
        (extra-spacing-width . (0.0 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
@@ -1096,7 +1096,7 @@
                        (staff-bar . (extra-space . 1.1))
                        (cue-clef . (extra-space . 0.5))
                        (right-edge . (extra-space . 0.5))
-                       (first-note . (fixed-space . 2.5))))
+                       (first-note . (semi-fixed-space . 2.5))))
        (stencil . ,ly:key-signature-interface::print)
        (extra-spacing-width . (0.0 . 0.5))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
@@ -2242,7 +2242,7 @@
        (non-musical . #t)
        (space-alist . (
                        (cue-clef . (extra-space . 1.5))
-                       (first-note . (fixed-space . 2.0))
+                       (first-note . (semi-fixed-space . 2.0))
                        (right-edge . (extra-space . 0.5))
                        (staff-bar . (minimum-space . 2.0))))
        (stencil . ,ly:time-signature::print)