vert. spacing: Revise/rename affected regtests.

diff --git a/input/regression/page-spacing-loose-lines-after.ly b/input/regression/page-spacing-loose-lines-after.ly
deleted file mode 100644 (file)
index 4bb87cd..0000000
--- a/input/regression/page-spacing-loose-lines-after.ly
+++ /dev/null
@@ -1,26 +0,0 @@
-\version "2.13.39"
-
-\header {
-    texidoc = "A loose line (eg. a lyric line) at the bottom of a system
-gets spaced appropriately."
-}
-
-\layout {
-  ragged-right = ##t
-  \context {
-    \Lyrics
-    \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'space = #20
-  }
-}
-<<
-    \new Staff \relative c'' {
-       d2 d c4 bes a2 \break
-    }
-    \addlyrics {
-       My first Li -- ly song,
-    }
-    \addlyrics {
-       Not much can go wrong!
-    }
->>
-

diff --git a/input/regression/page-spacing-loose-lines-and-markup.ly b/input/regression/page-spacing-loose-lines-and-markup.ly
deleted file mode 100644 (file)
index 9191d58..0000000
--- a/input/regression/page-spacing-loose-lines-and-markup.ly
+++ /dev/null
@@ -1,21 +0,0 @@
-\version "2.13.4"
-
-\header {
-  texidoc = "Having markup after a loose line doesn't confuse the page layout
-engine."
-}
-
-#(set-default-paper-size "a6")
-
-\book {
-  \score {
-  <<
-     \new Staff <<
-       \new Voice = "asdf" { c' d' e' f' }
-     >>
-     \new Lyrics \lyricsto "asdf" \lyricmode { a b c d }
-  >>
-  }
-  \markup "blah blah blah"
-}
-

diff --git a/input/regression/page-spacing-loose-lines-before.ly b/input/regression/page-spacing-loose-lines-before.ly
deleted file mode 100644 (file)
index 7f30ac4..0000000
--- a/input/regression/page-spacing-loose-lines-before.ly
+++ /dev/null
@@ -1,28 +0,0 @@
-\version "2.13.39"
-
-\header {
-    texidoc = "A loose line (eg. a lyric line) at the top of a system
-is spaced appropriately."
-}
-
-\layout {
-  ragged-right = ##t
-  \context {
-    \Lyrics
-    \override VerticalAxisGroup
-      #'nonstaff-nonstaff-spacing #'minimum-distance = #20
-    \override VerticalAxisGroup #'staff-affinity = #DOWN
-  }
-}
-<<
-  \new Lyrics \lyricmode {
-    My2 first Li4 -- ly song,
-  }
-  \new Lyrics \lyricmode {
-    Not2 much can4 go wrong!
-  }
-  \context Voice = "voice" \relative c'' {
-    d2 d c4 bes a2
-  }
->>
-

diff --git a/input/regression/page-spacing-loose-lines-between-systems.ly b/input/regression/page-spacing-loose-lines-between-systems.ly
deleted file mode 100644 (file)
index 84142c1..0000000
--- a/input/regression/page-spacing-loose-lines-between-systems.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\version "2.13.7"
-
-\header {
-  texidoc = "The vertical spacing engine is not confused by
-a loose line below a system followed by a loose line above
-the next system."
-}
-
-\paper {
-  indent = 0
-  ragged-right = ##t
-}
-
-\book {
-  \score {
-    <<
-      \chords { s1 \break d1 }
-      \relative c { c1 c1 }
-      \addlyrics { word }
-    >>
-  }
-}
-

diff --git a/input/regression/page-spacing-loose-lines-between.ly b/input/regression/page-spacing-loose-lines-between.ly
deleted file mode 100644 (file)
index acc55b9..0000000
--- a/input/regression/page-spacing-loose-lines-between.ly
+++ /dev/null
@@ -1,31 +0,0 @@
-\version "2.13.36"
-
-\header {
-  texidoc = "Loose lines between two systems don't confuse the
-layout engine.  In particular, they don't interfere with
-@code{system-system-spacing}, which controls the flexible spacing
-between the two closest staves of consecutive systems."
-}
-
-\paper {
-  ragged-right = ##t
-  system-system-spacing = #'((space . 20) (minimum-distance . 30))
-  annotate-spacing = ##t
-}
-
-<<
-  \new Lyrics
-  \with { \override VerticalAxisGroup #'staff-affinity = #DOWN }
-  \lyricmode {
-    My2 first Li4 -- ly song,2
-    My2 first Li4 -- ly song,2
-  }
-  \context Voice = "voice" \relative c'' {
-    d2 d c4 bes a2 \break
-    d'2 d c4 bes a2
-  }
-  \new Lyrics \lyricmode {
-    Not2 much can4 go wrong!2
-    Not2 much can4 go wrong!2
-  }
->>

diff --git a/input/regression/page-spacing-loose-lines-header-padding.ly b/input/regression/page-spacing-loose-lines-header-padding.ly
deleted file mode 100644 (file)
index 7b7285c..0000000
--- a/input/regression/page-spacing-loose-lines-header-padding.ly
+++ /dev/null
@@ -1,32 +0,0 @@
-\version "2.13.36"
-
-\header {
-  texidoc = "Padding from the header and footer is measured to the first
-line, whether or not it is spaceable."
-}
-
-#(set-default-paper-size "a6")
-
-\book {
-  \paper {
-    top-system-spacing = #'((space . 1) (padding . 10))
-    last-bottom-spacing = #'((space . 1) (padding . 10))
-    annotate-spacing = ##t
-    ragged-last-bottom = ##f
-  }
-
-  \score {
-    <<
-      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
-      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
-      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
-      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
-      \new Staff { c'1 }
-      \new Staff { c'1 }
-      \new Lyrics \lyricmode { foo }
-      \new Lyrics \lyricmode { foo }
-      \new Lyrics \lyricmode { foo }
-      \new Lyrics \lyricmode { foo }
-    >>
-  }
-}

diff --git a/input/regression/page-spacing-loose-lines-non-affinity.ly b/input/regression/page-spacing-loose-lines-non-affinity.ly
deleted file mode 100644 (file)
index 2087cab..0000000
--- a/input/regression/page-spacing-loose-lines-non-affinity.ly
+++ /dev/null
@@ -1,15 +0,0 @@
-\version "2.13.39"
-
-\header {
-  texidoc = "Loose lines can specify their padding or min-distance to the
-staff for which they don't have affinity."
-}
-
-<<
-  \new Staff { c'1 }
-  \new Lyrics \with {
-    \override VerticalAxisGroup
-      #'nonstaff-unrelatedstaff-spacing #'padding = #'20
-  } \lyricmode { foo }
-  \new Staff { c'1 }
->>

diff --git a/input/regression/page-spacing-nonstaff-lines-and-markup.ly b/input/regression/page-spacing-nonstaff-lines-and-markup.ly
new file mode 100644 (file)
index 0000000..9c8e49f
--- /dev/null
+++ b/input/regression/page-spacing-nonstaff-lines-and-markup.ly
@@ -0,0 +1,21 @@
+\version "2.13.4"
+
+\header {
+  texidoc = "Having markup after a non-staff line doesn't confuse
+the page layout engine."
+}
+
+#(set-default-paper-size "a6")
+
+\book {
+  \score {
+  <<
+     \new Staff <<
+       \new Voice = "asdf" { c' d' e' f' }
+     >>
+     \new Lyrics \lyricsto "asdf" \lyricmode { a b c d }
+  >>
+  }
+  \markup "blah blah blah"
+}
+

diff --git a/input/regression/page-spacing-nonstaff-lines-between-systems.ly b/input/regression/page-spacing-nonstaff-lines-between-systems.ly
new file mode 100644 (file)
index 0000000..da6600e
--- /dev/null
+++ b/input/regression/page-spacing-nonstaff-lines-between-systems.ly
@@ -0,0 +1,23 @@
+\version "2.13.7"
+
+\header {
+  texidoc = "The vertical spacing engine is not confused by a
+non-staff line below a system followed by a loose line above the
+next system."
+}
+
+\paper {
+  indent = 0
+  ragged-right = ##t
+}
+
+\book {
+  \score {
+    <<
+      \chords { s1 \break d1 }
+      \relative c { c1 c1 }
+      \addlyrics { word }
+    >>
+  }
+}
+

diff --git a/input/regression/page-spacing-nonstaff-lines-between.ly b/input/regression/page-spacing-nonstaff-lines-between.ly
new file mode 100644 (file)
index 0000000..a8de135
--- /dev/null
+++ b/input/regression/page-spacing-nonstaff-lines-between.ly
@@ -0,0 +1,31 @@
+\version "2.13.36"
+
+\header {
+  texidoc = "Non-staff lines between two systems don't confuse the
+layout engine.  In particular, they don't interfere with
+@code{system-system-spacing}, which controls the flexible spacing
+between the two closest staves of consecutive systems."
+}
+
+\paper {
+  ragged-right = ##t
+  system-system-spacing = #'((space . 20) (minimum-distance . 30))
+  annotate-spacing = ##t
+}
+
+<<
+  \new Lyrics
+  \with { \override VerticalAxisGroup #'staff-affinity = #DOWN }
+  \lyricmode {
+    My2 first Li4 -- ly song,2
+    My2 first Li4 -- ly song,2
+  }
+  \context Voice = "voice" \relative c'' {
+    d2 d c4 bes a2 \break
+    d'2 d c4 bes a2
+  }
+  \new Lyrics \lyricmode {
+    Not2 much can4 go wrong!2
+    Not2 much can4 go wrong!2
+  }
+>>

diff --git a/input/regression/page-spacing-nonstaff-lines-bottom.ly b/input/regression/page-spacing-nonstaff-lines-bottom.ly
new file mode 100644 (file)
index 0000000..ec15e48
--- /dev/null
+++ b/input/regression/page-spacing-nonstaff-lines-bottom.ly
@@ -0,0 +1,26 @@
+\version "2.13.39"
+
+\header {
+  texidoc = "A non-staff line (such as @code{Lyrics}) at the
+bottom of a system gets spaced appropriately."
+}
+
+\layout {
+  ragged-right = ##t
+  \context {
+    \Lyrics
+    \override VerticalAxisGroup #'nonstaff-nonstaff-spacing #'space = #20
+  }
+}
+<<
+    \new Staff \relative c'' {
+       d2 d c4 bes a2 \break
+    }
+    \addlyrics {
+       My first Li -- ly song,
+    }
+    \addlyrics {
+       Not much can go wrong!
+    }
+>>
+

diff --git a/input/regression/page-spacing-nonstaff-lines-header-padding.ly b/input/regression/page-spacing-nonstaff-lines-header-padding.ly
new file mode 100644 (file)
index 0000000..e83b246
--- /dev/null
+++ b/input/regression/page-spacing-nonstaff-lines-header-padding.ly
@@ -0,0 +1,32 @@
+\version "2.13.36"
+
+\header {
+  texidoc = "Padding from the header and footer is measured to the
+first non-staff line, whether or not it is spaceable."
+}
+
+#(set-default-paper-size "a6")
+
+\book {
+  \paper {
+    top-system-spacing = #'((space . 1) (padding . 10))
+    last-bottom-spacing = #'((space . 1) (padding . 10))
+    annotate-spacing = ##t
+    ragged-last-bottom = ##f
+  }
+
+  \score {
+    <<
+      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
+      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
+      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
+      \new Lyrics \with { \override VerticalAxisGroup #'staff-affinity = #DOWN } \lyricmode { foo }
+      \new Staff { c'1 }
+      \new Staff { c'1 }
+      \new Lyrics \lyricmode { foo }
+      \new Lyrics \lyricmode { foo }
+      \new Lyrics \lyricmode { foo }
+      \new Lyrics \lyricmode { foo }
+    >>
+  }
+}

diff --git a/input/regression/page-spacing-nonstaff-lines-top.ly b/input/regression/page-spacing-nonstaff-lines-top.ly
new file mode 100644 (file)
index 0000000..9ab9b8f
--- /dev/null
+++ b/input/regression/page-spacing-nonstaff-lines-top.ly
@@ -0,0 +1,28 @@
+\version "2.13.39"
+
+\header {
+  texidoc = "A non-staff line (such as @code{Lyrics}) at the top
+of a system is spaced appropriately."
+}
+
+\layout {
+  ragged-right = ##t
+  \context {
+    \Lyrics
+    \override VerticalAxisGroup
+      #'nonstaff-nonstaff-spacing #'minimum-distance = #20
+    \override VerticalAxisGroup #'staff-affinity = #DOWN
+  }
+}
+<<
+  \new Lyrics \lyricmode {
+    My2 first Li4 -- ly song,
+  }
+  \new Lyrics \lyricmode {
+    Not2 much can4 go wrong!
+  }
+  \context Voice = "voice" \relative c'' {
+    d2 d c4 bes a2
+  }
+>>
+

diff --git a/input/regression/page-spacing-nonstaff-lines-unrelated.ly b/input/regression/page-spacing-nonstaff-lines-unrelated.ly
new file mode 100644 (file)
index 0000000..c1c6c12
--- /dev/null
+++ b/input/regression/page-spacing-nonstaff-lines-unrelated.ly
@@ -0,0 +1,16 @@
+\version "2.13.39"
+
+\header {
+  texidoc = "Non-staff lines (such as @code{Lyrics}) can specify
+their @code{padding} or @code{minimum-distance} to the staff for
+which they don't have affinity."
+}
+
+<<
+  \new Staff { c'1 }
+  \new Lyrics \with {
+    \override VerticalAxisGroup
+      #'nonstaff-unrelatedstaff-spacing #'padding = #'20
+  } \lyricmode { foo }
+  \new Staff { c'1 }
+>>