Update spacing for Keith Ohara's suggested defaults

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 7f7ebfc604666b09a4e67b0acde14169662a93da..515c1cd3bb887446b347956a3177547313102e65 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -299,6 +299,7 @@ contained staves are connected vertically."
   \consists "Span_arpeggio_engraver"
   \consists "System_start_delimiter_engraver"
   systemStartDelimiter = #'SystemStartBrace
+  topLevelAlignment = ##f
 
   \defaultchild "Staff"
   \accepts "Staff"
@@ -319,8 +320,6 @@ instrument names at the start of each system."
   \consists "Keep_alive_together_engraver"
   topLevelAlignment = ##f
 
-  \override StaffGrouper #'staff-staff-spacing #'stretchability = #5
-
   instrumentName = #'()
   shortInstrumentName = #'()
 }
@@ -416,7 +415,7 @@ printing of a single line of lyrics."
        (stretchability . 0)
        (padding . 0.2)
        (minimum-distance . 2.8))
-  \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #1.0
+  \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #1.5
   \override InstrumentName #'self-alignment-Y = ##f
 
   %% sync with define-grobs.scm ;

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index f8460ca12b775bce946435417cf41f821257e6c3..be908e30fd6d2abf274e2b529735b16d69ee1a14 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -57,14 +57,14 @@
        (is-book-title . #t)))
 
   %% Note: these are not scaled; they are in staff-spaces.
-  system-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1))
-  score-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1))
-  markup-system-spacing = #'((space . 5) (padding . 0.5))
-  score-markup-spacing = #'((space . 12) (padding . 0.5))
+  system-system-spacing = #'((space . 12) (minimum-distance . 8) (padding . 1) (stretchability . 60))
+  score-system-spacing = #'((space . 14) (minimum-distance . 8) (padding . 1) (stretchability . 120))
+  markup-system-spacing = #'((space . 5) (padding . 0.5) (stretchability . 30))
+  score-markup-spacing = #'((space . 12) (padding . 0.5) (stretchability . 60))
   markup-markup-spacing = #'((space . 1) (padding . 0.5))
   top-system-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0))
   top-markup-spacing = #'((space . 0) (padding . 1) (minimum-distance . 0))
-  last-bottom-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 5))
+  last-bottom-spacing = #'((space . 1) (padding . 1) (minimum-distance . 0) (stretchability . 30))
 
   ragged-bottom = ##f
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 5dfaa600307a0ead30d3b5e85f2732c5e3bd3527..d68a2452f0bdbcee4136bc56b39ed06182fbab9b 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1690,9 +1690,11 @@
     (StaffGrouper
      . (
        (staff-staff-spacing . ((space . 9)
+                                (stretchability . 5)
                                (minimum-distance . 7)
                                (padding . 1)))
        (staffgroup-staff-spacing . ((space . 10.5)
+                                     (stretchability . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)))
        (meta . ((class . Spanner)