vert. spacing: Convert affected regtests, clean up.

6 files changed, 26 insertions, 19 deletions

diff --git a/input/regression/page-breaking-min-distance2.ly b/input/regression/page-breaking-min-distance2.ly
index d194f68f78..4634fbe2b8 100644
--- a/input/regression/page-breaking-min-distance2.ly
+++ b/input/regression/page-breaking-min-distance2.ly
@@ -1,4 +1,4 @@
-\version "2.13.37"
+\version "2.13.39"
 
 \header {
   texidoc = "minimum-distance within a system is correctly accounted for in page breaking."
@@ -7,7 +7,9 @@
 \layout {
   \context {
     \Score
-    \override VerticalAxisGroup #'next-staff-spacing = #'((space . 20) (stretchability . 0))
+    \override VerticalAxisGroup #'staff-staff-spacing =
+      #'((space . 20)
+         (stretchability . 0))
   }
 }
 
diff --git a/input/regression/page-spacing-loose-lines-after.ly b/input/regression/page-spacing-loose-lines-after.ly
index 65bd242c3d..4bb87cd7ff 100644
--- a/input/regression/page-spacing-loose-lines-after.ly
+++ b/input/regression/page-spacing-loose-lines-after.ly
@@ -1,4 +1,4 @@
-\version "2.13.4"
+\version "2.13.39"
 
 \header {
     texidoc = "A loose line (eg. a lyric line) at the bottom of a system
@@ -9,7 +9,7 @@ gets spaced appropriately."
   ragged-right = ##t
   \context {
     \Lyrics
-    \override VerticalAxisGroup #'inter-loose-line-spacing #'space = #20
+    \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'space = #20
   }
 }
 <<
diff --git a/input/regression/page-spacing-loose-lines-before.ly b/input/regression/page-spacing-loose-lines-before.ly
index 66cfb814a8..7f30ac4529 100644
--- a/input/regression/page-spacing-loose-lines-before.ly
+++ b/input/regression/page-spacing-loose-lines-before.ly
@@ -1,4 +1,4 @@
-\version "2.13.4"
+\version "2.13.39"
 
 \header {
     texidoc = "A loose line (eg. a lyric line) at the top of a system
@@ -9,7 +9,8 @@ is spaced appropriately."
   ragged-right = ##t
   \context {
     \Lyrics
-    \override VerticalAxisGroup #'inter-loose-line-spacing #'minimum-distance = #20
+    \override VerticalAxisGroup
+      #'nonstaff-nonstaff-spacing #'minimum-distance = #20
     \override VerticalAxisGroup #'staff-affinity = #DOWN
   }
 }
diff --git a/input/regression/page-spacing-loose-lines-non-affinity.ly b/input/regression/page-spacing-loose-lines-non-affinity.ly
index 095080d6c0..2087cab7ca 100644
--- a/input/regression/page-spacing-loose-lines-non-affinity.ly
+++ b/input/regression/page-spacing-loose-lines-non-affinity.ly
@@ -1,4 +1,4 @@
-\version "2.13.4"
+\version "2.13.39"
 
 \header {
   texidoc = "Loose lines can specify their padding or min-distance to the
@@ -7,7 +7,9 @@ staff for which they don't have affinity."
 
 <<
   \new Staff { c'1 }
-  \new Lyrics \with { \override VerticalAxisGroup #'non-affinity-spacing #'padding = #'20 }
-    \lyricmode { foo }
+  \new Lyrics \with {
+    \override VerticalAxisGroup
+      #'nonstaff-unrelatedstaff-spacing #'padding = #'20
+  } \lyricmode { foo }
   \new Staff { c'1 }
->>
\ No newline at end of file
+>>
diff --git a/input/regression/page-spacing-staff-group-hara-kiri.ly b/input/regression/page-spacing-staff-group-hara-kiri.ly
index c89e123eda..940e3ace8c 100644
--- a/input/regression/page-spacing-staff-group-hara-kiri.ly
+++ b/input/regression/page-spacing-staff-group-hara-kiri.ly
@@ -1,4 +1,4 @@
-\version "2.13.23"
+\version "2.13.39"
 
 \header {
   texidoc = "StaffGrouper interacts correctly with \RemoveEmptyStaffContext.
@@ -18,7 +18,7 @@ In both systems, there should be a large space between the staff groups."
 \score {
   <<
     \new StaffGroup = "G1" \with {
-      \override StaffGrouper #'after-last-staff-spacing #'space = #20
+      \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
     }
     <<
       \new Staff { c'1 \break c'1 \break R1 }
@@ -26,4 +26,4 @@ In both systems, there should be a large space between the staff groups."
     >>
     \new Staff { c'1 c'1 c'1 }
   >>
-}
\ No newline at end of file
+}
diff --git a/input/regression/page-spacing-stretchability.ly b/input/regression/page-spacing-stretchability.ly
index 563a12b426..0129c92e0c 100644
--- a/input/regression/page-spacing-stretchability.ly
+++ b/input/regression/page-spacing-stretchability.ly
@@ -1,4 +1,4 @@
-\version "2.13.2"
+\version "2.13.39"
 
 #(set-default-paper-size "a6")
 
@@ -11,9 +11,11 @@ between staves."
   }
 
   <<
-    \new Staff {c'1 \pageBreak c'1}
-    \new Staff \with { \override VerticalAxisGroup #'default-next-staff-spacing #'stretchability = #50 } {c'1 c'1}
-    
-    \new Staff {c'1 c'1}
+    \new Staff { c'1 \pageBreak c'1 }
+    \new Staff \with {
+      \override VerticalAxisGroup
+        #'default-staff-staff-spacing #'stretchability = #50
+    } { c'1 c'1 }
+    \new Staff { c'1 c'1 }
   >>
-}
\ No newline at end of file
+}