vert. spacing: Convert engraver-init.ly, clean up.

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0b6cd7b3aa68fc1dbda2aff660eb160553b9083a..dbc5e024198a020d2b94eaca671cd0fb928911e7 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -16,7 +16,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.13.27"
+\version "2.13.39"
 
 \context {
   \name "Global"
@@ -319,7 +319,7 @@ instrument names at the start of each system."
   \consists "Keep_alive_together_engraver"
   topLevelAlignment = ##f
 
-  \override StaffGrouper #'between-staff-spacing #'stretchability = #5
+  \override StaffGrouper #'staff-staff-spacing #'stretchability = #5
 
   instrumentName = #'()
   shortInstrumentName = #'()
@@ -375,7 +375,9 @@ a collection of staves, with a bracket in front and spanning bar lines."
   pedalSustainStrings = #'("Ped." "*Ped." "*")
   pedalUnaCordaStrings = #'("una corda" "" "tre corde")
   \override VerticalAxisGroup #'staff-affinity = #CENTER
-  \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5) (padding . 0.5))
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+    #'((space . 5)
+       (padding . 0.5))
   \override TextScript #'font-shape = #'italic
   \override DynamicLineSpanner #'Y-offset = #0
 
@@ -405,12 +407,16 @@ printing of a single line of lyrics."
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'staff-affinity = #UP
-  \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 5.5) (stretchability . 1) (padding . 0.5))
-  \override VerticalAxisGroup #'inter-loose-line-spacing = #'((space . 0)
-                                                             (stretchability . 0)
-                                                             (padding . 0.2)
-                                                             (minimum-distance . 2.8))
-  \override VerticalAxisGroup #'non-affinity-spacing #'padding = #1.0
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+    #'((space . 5.5)
+       (stretchability . 1)
+       (padding . 0.5))
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing =
+     #'((space . 0)
+       (stretchability . 0)
+       (padding . 0.2)
+       (minimum-distance . 2.8))
+  \override VerticalAxisGroup #'nonstaff-unrelatedstaff-spacing #'padding = #1.0
   \override InstrumentName #'self-alignment-Y = ##f
 
   %% sync with define-grobs.scm ;
@@ -449,8 +455,8 @@ printing of a single line of lyrics."
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'staff-affinity = #DOWN
-  \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
-  \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5
 }
 
 
@@ -698,8 +704,8 @@ automatically when an output definition (a @code{\score} or
   \override VerticalAxisGroup #'remove-empty = ##t
   \override VerticalAxisGroup #'remove-first = ##t
   \override VerticalAxisGroup #'staff-affinity = #UP
-  \override VerticalAxisGroup #'inter-staff-spacing #'padding = #0.5
-  \override VerticalAxisGroup #'inter-loose-line-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing #'padding = #0.5
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'padding = #0.5
 }
 
 \context {