Doc -- Fix issues 1483 and 1486

Update lyrics templates and lyrics snippets for new spacing
algorithms.

Make sure that lyrics above staves have 'staff-affinity set
to Down.

If using new spacing algorithm, add some space between staves,
above the top system, and below the bottom system for lyrics.

Also added a snippet that shows how to adjust new spacing
variables to get old behavior.

13 files changed, 495 insertions, 56 deletions

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 635984362f..8dcbd6426b 100644
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -67,6 +67,12 @@ which scares away people.
 @end ignore
 
 @item
+Lyrics above a staff must have their @code{staff-affinity} set to
+@code{DOWN} or must have their @code{alignAboveContext} property
+set in order to be properly aligned.  For more information, see
+@ruser{Placing lyrics vertically}.
+
+@item
 @code{stringTunings} property values have changed from a list of
 semitones above middle C to a list of LilyPond pitch values.
 convert-ly will handle the change automatically where the value
diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 6ac29afe71..247bb39f6e 100644
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -987,8 +987,9 @@ context:
 @end lilypond
 
 Lyrics may be positioned above the staff using one of
-two methods.  The simplest is to use the same syntax as
-above and explicitly specify the position of the lyrics:
+two methods.  The simplest (and preferred) method
+is to use the same syntax as above and explicitly
+specify the position of the lyrics:
 
 @lilypond[quote,verbatim]
 \score {
@@ -1016,7 +1017,10 @@ follows:
 @lilypond[quote,verbatim]
 \score {
   <<
-    \new Lyrics = "lyrics"
+    \new Lyrics = "lyrics" \with {
+      % lyrics above a staff should have this override
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
     \new Staff {
       \new Voice = "melody" {
         \relative c'' { c4 c c c }
@@ -1044,7 +1048,10 @@ is an example of the second method:
       }
     }
     \new Lyrics = "sopranos"
-    \new Lyrics = "contraltos"
+    \new Lyrics = "contraltos" \with {
+      % lyrics above a staff should have this override
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
     \new Staff {
       \new Voice = "contraltos" {
         \relative c'' { a4 a a a }
@@ -1068,6 +1075,10 @@ Other combinations of lyrics and staves may be generated by
 elaborating these examples, or by examining the
 @rlearning{Vocal ensembles} templates in the Learning Manual.
 
+@snippets
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{lyrics-old-spacing-settings.ly}
+
 @seealso
 Learning Manual:
 @rlearning{Vocal ensembles}.
diff --git a/Documentation/snippets/lyrics-old-spacing-settings.ly b/Documentation/snippets/lyrics-old-spacing-settings.ly
new file mode 100644
index 0000000000..03b83e3864
--- /dev/null
+++ b/Documentation/snippets/lyrics-old-spacing-settings.ly
@@ -0,0 +1,97 @@
+% Do not edit this file; it is automatically
+% generated from Documentation/snippets/new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.47
+\version "2.13.47"

+

+\header {

+  lsrtags = "vocal-music"

+  texidoc = "

+The vertical spacing engine changed for version 2.14.  This can

+cause lyrics to be spaced differently.  It is possible to set

+properties for @code{Lyric} and @code{Staff} contexts to get the

+spacing engine to behave as it did in version 2.12.

+"

+}

+

+global = {

+  \key d \major

+  \time 3/4

+}

+

+sopMusic = \relative c' {

+  % VERSE ONE

+  fis4 fis fis | \break

+  fis4. e8 e4

+}

+

+altoMusic = \relative c' {

+  % VERSE ONE

+  d4 d d |

+  d4. b8 b4 |

+}

+

+tenorMusic = \relative c' {

+  a4 a a |

+  b4. g8 g4 |

+}

+

+bassMusic = \relative c {

+  d4 d d |

+  g,4. g8 g4 |

+}

+

+words = \lyricmode {

+  Great is Thy faith- ful- ness,

+}

+

+\score {

+  \new ChoirStaff <<

+    \new Lyrics = sopranos

+    \new Staff = women <<

+      \new Voice = "sopranos" {

+        \voiceOne

+        \global \sopMusic

+      }

+      \new Voice = "altos" {

+        \voiceTwo

+        \global \altoMusic

+      }

+    >>

+    \new Lyrics = "altos"

+    \new Lyrics = "tenors"

+    \new Staff = men <<

+      \clef bass

+      \new Voice = "tenors" {

+        \voiceOne

+        \global \tenorMusic

+      }

+      \new Voice = "basses" {

+        \voiceTwo  \global \bassMusic

+      }

+    >>

+    \new Lyrics = basses

+    \context Lyrics = sopranos \lyricsto sopranos \words

+    \context Lyrics = altos \lyricsto altos \words

+    \context Lyrics = tenors \lyricsto tenors \words

+    \context Lyrics = basses \lyricsto basses \words

+  >>

+  \layout {

+    \context {

+      \Lyrics

+      \override VerticalAxisGroup #'staff-affinity = ##f

+      \override VerticalAxisGroup #'staff-staff-spacing =

+        #'((basic-distance . 0)

+	   (minimum-distance . 2)

+	   (padding . 2))

+    }

+    \context {

+      \Staff

+      \override VerticalAxisGroup #'staff-staff-spacing =

+        #'((basic-distance . 0)

+	   (minimum-distance . 2)

+	   (padding . 2))

+    }

+  }

+}

+

diff --git a/Documentation/snippets/new/lyrics-old-spacing-settings.ly b/Documentation/snippets/new/lyrics-old-spacing-settings.ly
new file mode 100644
index 0000000000..23167688c7
--- /dev/null
+++ b/Documentation/snippets/new/lyrics-old-spacing-settings.ly
@@ -0,0 +1,93 @@
+\version "2.13.47"

+

+\header {

+  lsrtags = "vocal-music"

+  texidoc = "

+The vertical spacing engine changed for version 2.14.  This can

+cause lyrics to be spaced differently.  It is possible to set

+properties for @code{Lyric} and @code{Staff} contexts to get the

+spacing engine to behave as it did in version 2.12.

+"

+}

+

+global = {

+  \key d \major

+  \time 3/4

+}

+

+sopMusic = \relative c' {

+  % VERSE ONE

+  fis4 fis fis | \break

+  fis4. e8 e4

+}

+

+altoMusic = \relative c' {

+  % VERSE ONE

+  d4 d d |

+  d4. b8 b4 |

+}

+

+tenorMusic = \relative c' {

+  a4 a a |

+  b4. g8 g4 |

+}

+

+bassMusic = \relative c {

+  d4 d d |

+  g,4. g8 g4 |

+}

+

+words = \lyricmode {

+  Great is Thy faith- ful- ness,

+}

+

+\score {

+  \new ChoirStaff <<

+    \new Lyrics = sopranos

+    \new Staff = women <<

+      \new Voice = "sopranos" {

+        \voiceOne

+        \global \sopMusic

+      }

+      \new Voice = "altos" {

+        \voiceTwo

+        \global \altoMusic

+      }

+    >>

+    \new Lyrics = "altos"

+    \new Lyrics = "tenors"

+    \new Staff = men <<

+      \clef bass

+      \new Voice = "tenors" {

+        \voiceOne

+        \global \tenorMusic

+      }

+      \new Voice = "basses" {

+        \voiceTwo  \global \bassMusic

+      }

+    >>

+    \new Lyrics = basses

+    \context Lyrics = sopranos \lyricsto sopranos \words

+    \context Lyrics = altos \lyricsto altos \words

+    \context Lyrics = tenors \lyricsto tenors \words

+    \context Lyrics = basses \lyricsto basses \words

+  >>

+  \layout {

+    \context {

+      \Lyrics

+      \override VerticalAxisGroup #'staff-affinity = ##f

+      \override VerticalAxisGroup #'staff-staff-spacing =

+        #'((basic-distance . 0)

+	   (minimum-distance . 2)

+	   (padding . 2))

+    }

+    \context {

+      \Staff

+      \override VerticalAxisGroup #'staff-staff-spacing =

+        #'((basic-distance . 0)

+	   (minimum-distance . 2)

+	   (padding . 2))

+    }

+  }

+}

+

diff --git a/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly
new file mode 100644
index 0000000000..925d174401
--- /dev/null
+++ b/Documentation/snippets/new/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -0,0 +1,101 @@
+\version "2.13.47"
+
+\header {
+  lsrtags = "vocal-music, keyboards, template"
+
+  texidoc = "
+This template adds an automatic piano reduction to the standard SATB
+vocal score demonstrated in @qq{Vocal ensemble template}. This
+demonstrates one of the strengths of LilyPond – you can use a music
+definition more than once. If any changes are made to the vocal notes
+(say, @code{tenorMusic}), then the changes will also apply to the piano
+reduction.
+"
+  doctitle = "Vocal ensemble template with automatic piano reduction"
+}
+
+\paper {
+  top-system-spacing #'basic-distance = #10
+  score-system-spacing #'basic-distance = #20
+  system-system-spacing #'basic-distance = #20
+  last-bottom-spacing #'basic-distance = #10
+}
+
+global = {
+  \key c \major
+  \time 4/4
+}
+
+sopMusic = \relative c'' {
+  c4 c c8[( b)] c4
+}
+sopWords = \lyricmode {
+  hi hi hi hi
+}
+
+altoMusic = \relative c' {
+  e4 f d e
+}
+altoWords =\lyricmode {
+  ha ha ha ha
+}
+
+tenorMusic = \relative c' {
+  g4 a f g
+}
+tenorWords = \lyricmode {
+  hu hu hu hu
+}
+
+bassMusic = \relative c {
+  c4 c g c
+}
+bassWords = \lyricmode {
+  ho ho ho ho
+}
+
+\score {
+  <<
+    \new ChoirStaff <<
+      \new Lyrics = "sopranos" \with {
+        % This is needed for lyrics above a staff
+        \override VerticalAxisGroup #'staff-affinity = #DOWN
+      }
+      \new Staff = "women" <<
+        \new Voice = "sopranos" { \voiceOne << \global \sopMusic >> }
+        \new Voice = "altos" { \voiceTwo << \global \altoMusic >> }
+      >>
+      \new Lyrics = "altos"
+      \new Lyrics = "tenors" \with {
+        % This is needed for lyrics above a staff
+        \override VerticalAxisGroup #'staff-affinity = #DOWN
+      }
+
+      \new Staff = "men" <<
+        \clef bass
+        \new Voice = "tenors" { \voiceOne << \global \tenorMusic >> }
+        \new Voice = "basses" { \voiceTwo << \global \bassMusic >> }
+      >>
+      \new Lyrics = "basses"
+      \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords
+      \context Lyrics = "altos" \lyricsto "altos" \altoWords
+      \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords
+      \context Lyrics = "basses" \lyricsto "basses" \bassWords
+    >>
+    \new PianoStaff <<
+      \new Staff <<
+        \set Staff.printPartCombineTexts = ##f
+        \partcombine
+        << \global \sopMusic >>
+        << \global \altoMusic >>
+      >>
+      \new Staff <<
+        \clef bass
+        \set Staff.printPartCombineTexts = ##f
+        \partcombine
+        << \global \tenorMusic >>
+        << \global \bassMusic >>
+      >>
+    >>
+  >>
+}
diff --git a/Documentation/snippets/new/vocal-ensemble-template.ly b/Documentation/snippets/new/vocal-ensemble-template.ly
new file mode 100644
index 0000000000..a9a8f9af2b
--- /dev/null
+++ b/Documentation/snippets/new/vocal-ensemble-template.ly
@@ -0,0 +1,94 @@
+\version "2.13.47"
+
+\header {
+  lsrtags = "vocal-music, template"
+
+  texidoc = "
+Here is a standard four-part SATB vocal score. With larger ensembles,
+it is often useful to include a section which is included in all parts.
+For example, the time signature and key signature are almost always the
+same for all parts. Like in the @qq{Hymn} template, the four voices are
+regrouped on only two staves.
+"
+  doctitle = "Vocal ensemble template"
+}
+
+\paper {
+  top-system-spacing #'basic-distance = #10
+  score-system-spacing #'basic-distance = #20
+  system-system-spacing #'basic-distance = #20
+  last-bottom-spacing #'basic-distance = #10
+}
+
+global = {
+  \key c \major
+  \time 4/4
+}
+
+sopMusic = \relative c'' {
+  c4 c c8[( b)] c4
+}
+sopWords = \lyricmode {
+  hi hi hi hi
+}
+
+altoMusic = \relative c' {
+  e4 f d e
+}
+altoWords = \lyricmode {
+  ha ha ha ha
+}
+
+tenorMusic = \relative c' {
+  g4 a f g
+}
+tenorWords = \lyricmode {
+  hu hu hu hu
+}
+
+bassMusic = \relative c {
+  c4 c g c
+}
+bassWords = \lyricmode {
+  ho ho ho ho
+}
+
+\score {
+  \new ChoirStaff <<
+    \new Lyrics = "sopranos" \with {
+      % this is needed for lyrics above a staff
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
+    \new Staff = "women" <<
+      \new Voice = "sopranos" {
+        \voiceOne
+        << \global \sopMusic >>
+      }
+      \new Voice = "altos" {
+        \voiceTwo
+        << \global \altoMusic >>
+      }
+    >>
+    \new Lyrics = "altos"
+    \new Lyrics = "tenors" \with {
+      % this is needed for lyrics above a staff
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
+    \new Staff = "men" <<
+      \clef bass
+      \new Voice = "tenors" {
+        \voiceOne
+        << \global \tenorMusic >>
+      }
+      \new Voice = "basses" {
+        \voiceTwo << \global \bassMusic >>
+      }
+    >>
+    \new Lyrics = "basses"
+    \context Lyrics = "sopranos" \lyricsto "sopranos" \sopWords
+    \context Lyrics = "altos" \lyricsto "altos" \altoWords
+    \context Lyrics = "tenors" \lyricsto "tenors" \tenorWords
+    \context Lyrics = "basses" \lyricsto "basses" \bassWords
+  >>
+}
+
diff --git a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
index 3ce4d974b9..fb44fb796c 100644
--- a/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -1,11 +1,10 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.2"
+% Do not edit this file; it is automatically
+% generated from Documentation/snippets/new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.47
+\version "2.13.47"
 
 \header {
-  lsrtags = "vocal-music, keyboards, template"
-
 %% Translation of GIT committish: fa19277d20f8ab0397c560eb0e7b814bd804ecec
   texidoces = "
 
@@ -49,6 +48,8 @@ sera automatiquement reportée dans la réduction pour piano.
 "
   doctitlefr = "Ensemble vocal avec réduction pour piano"
 
+  lsrtags = "vocal-music, keyboards, template"
+
   texidoc = "
 This template adds an automatic piano reduction to the standard SATB
 vocal score demonstrated in @qq{Vocal ensemble template}. This
@@ -56,11 +57,18 @@ demonstrates one of the strengths of LilyPond – you can use a music
 definition more than once. If any changes are made to the vocal notes
 (say, @code{tenorMusic}), then the changes will also apply to the piano
 reduction.
-
 "
   doctitle = "Vocal ensemble template with automatic piano reduction"
 } % begin verbatim
 
+
+\paper {
+  top-system-spacing #'basic-distance = #10
+  score-system-spacing #'basic-distance = #20
+  system-system-spacing #'basic-distance = #20
+  last-bottom-spacing #'basic-distance = #10
+}
+
 global = {
   \key c \major
   \time 4/4
@@ -97,13 +105,20 @@ bassWords = \lyricmode {
 \score {
   <<
     \new ChoirStaff <<
-      \new Lyrics = "sopranos"
+      \new Lyrics = "sopranos" \with {
+        % This is needed for lyrics above a staff
+        \override VerticalAxisGroup #'staff-affinity = #DOWN
+      }
       \new Staff = "women" <<
         \new Voice = "sopranos" { \voiceOne << \global \sopMusic >> }
         \new Voice = "altos" { \voiceTwo << \global \altoMusic >> }
       >>
       \new Lyrics = "altos"
-      \new Lyrics = "tenors"
+      \new Lyrics = "tenors" \with {
+        % This is needed for lyrics above a staff
+        \override VerticalAxisGroup #'staff-affinity = #DOWN
+      }
+
       \new Staff = "men" <<
         \clef bass
         \new Voice = "tenors" { \voiceOne << \global \tenorMusic >> }
@@ -132,4 +147,3 @@ bassWords = \lyricmode {
     >>
   >>
 }
-
diff --git a/Documentation/snippets/vocal-ensemble-template.ly b/Documentation/snippets/vocal-ensemble-template.ly
index 4a0587a9d2..7b0c88cde5 100644
--- a/Documentation/snippets/vocal-ensemble-template.ly
+++ b/Documentation/snippets/vocal-ensemble-template.ly
@@ -1,11 +1,10 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.2"
+% Do not edit this file; it is automatically
+% generated from Documentation/snippets/new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.47
+\version "2.13.47"
 
 \header {
-  lsrtags = "vocal-music, template"
-
 %% Translation of GIT committish: fa19277d20f8ab0397c560eb0e7b814bd804ecec
   texidoces = "
 He aquí una partitura vocal estándar para cuatro voces SATB. Con
@@ -49,17 +48,26 @@ portées.
 "
   doctitlefr = "Ensemble vocal (simple)"
 
+  lsrtags = "vocal-music, template"
+
   texidoc = "
 Here is a standard four-part SATB vocal score. With larger ensembles,
 it is often useful to include a section which is included in all parts.
 For example, the time signature and key signature are almost always the
 same for all parts. Like in the @qq{Hymn} template, the four voices are
 regrouped on only two staves.
-
 "
   doctitle = "Vocal ensemble template"
 } % begin verbatim
 
+
+\paper {
+  top-system-spacing #'basic-distance = #10
+  score-system-spacing #'basic-distance = #20
+  system-system-spacing #'basic-distance = #20
+  last-bottom-spacing #'basic-distance = #10
+}
+
 global = {
   \key c \major
   \time 4/4
@@ -95,7 +103,10 @@ bassWords = \lyricmode {
 
 \score {
   \new ChoirStaff <<
-    \new Lyrics = "sopranos"
+    \new Lyrics = "sopranos" \with {
+      % this is needed for lyrics above a staff
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
     \new Staff = "women" <<
       \new Voice = "sopranos" {
         \voiceOne
@@ -107,7 +118,10 @@ bassWords = \lyricmode {
       }
     >>
     \new Lyrics = "altos"
-    \new Lyrics = "tenors"
+    \new Lyrics = "tenors" \with {
+      % this is needed for lyrics above a staff
+      \override VerticalAxisGroup #'staff-affinity = #DOWN
+    }
     \new Staff = "men" <<
       \clef bass
       \new Voice = "tenors" {
diff --git a/Documentation/snippets/vocal-music.snippet-list b/Documentation/snippets/vocal-music.snippet-list
index 1c8f51e2a2..e38fb6c94d 100644
--- a/Documentation/snippets/vocal-music.snippet-list
+++ b/Documentation/snippets/vocal-music.snippet-list
@@ -13,6 +13,7 @@ formatting-lyrics-syllables.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
 hymn-template.ly
 lyrics-alignment.ly
+lyrics-old-spacing-settings.ly
 marking-notes-of-spoken-parts-with-a-cross-on-the-stem.ly
 orchestra,-choir-and-piano-template.ly
 piano-template-with-melody-and-lyrics.ly
diff --git a/input/regression/baerenreiter-sarabande.ly b/input/regression/baerenreiter-sarabande.ly
index f0f2cd4da5..4d63357f2e 100644
--- a/input/regression/baerenreiter-sarabande.ly
+++ b/input/regression/baerenreiter-sarabande.ly
@@ -1,9 +1,9 @@
-\version "2.12.0"
+\version "2.13.46"
 
 forcedLastBreak =  { \break }
 
 %% We want this to perfectly match the Bärenreiter spacing.
-%% If we're not using 6 systems, there's definately a problem.
+%% If we're not using 6 systems, there's definitely a problem.
 #(define (assert-system-count smob n)
   (let ((systems (length (ly:spanner-broken-into
 			  (ly:grob-original
@@ -13,14 +13,14 @@ forcedLastBreak =  { \break }
 	;;(warn
 	(string-append "Got " (number->string systems)
 			     " systems (expecting " (number->string n))))))
-            
+
 
 #(define (assert-system-count-override count)
   (ly:export #{ \override NoteHead #'after-line-breaking
        = #(lambda (smob) (assert-system-count smob $count))
   #}))
 
-  
+
 \header {
   title = "Solo Cello Suite II"
   piece ="Sarabande"
@@ -53,17 +53,17 @@ half way in measure 13 has been forgotten.
 sarabandeA =  \context Voice  \relative c {
   \override Staff.NoteCollision  #'merge-differently-dotted = ##t
 
-  
+
   << { d8. e16 e4.\trill d16 e } \\
     { d4 a2 } >>
-  <d, a' f'>4.  e'8[ d c] | 
+  <d, a' f'>4.  e'8[ d c] |
   bes[ g'] f[
      e16(f] g[ a bes d,)] |
   cis4.\trill b8[ a g] |
 
-  %% check spacing without accs: 
+  %% check spacing without accs:
   %%	c4.\trill bes8[ a g] |
-  
+
   << { d'8. e16 e4.\trill d16 e |
       f4. d8[ e f] }
     \\
@@ -85,7 +85,7 @@ sarabandeA =  \context Voice  \relative c {
   %% 11
   e'8[ f] c,[ g'] f'[ e] |
   f4 f,2 |
-  << {  a'4 a4.\trill bes8 
+  << {  a'4 a4.\trill bes8
        c bes16 a } \\
     { f8[ es] es4. r8 d4 } >>
 
@@ -93,14 +93,14 @@ sarabandeA =  \context Voice  \relative c {
   bes[ g']
   a,[ fis']
   es'[ d] |
-  
+
   %%16
   < bes d, g, >4.\trill a8[ g f!] |
   e bes a f' g a |
   d, as g es' f g |
   cis,[ bes'] a[ g16 f] e!8[ f16 d] |
   cis8 e16 a a,8. g'16 f8(e) |
-  
+
   %%21
   << { d e16(f) f4. e16(d) |
       e8 f16(g) g4. a16(bes) |
@@ -162,7 +162,7 @@ smallerPaper = \layout {
     \Score
     \override SpacingSpanner #'spacing-increment = #0.96
   }
-  
+
   indent = 5.6 \mm
   line-width = 146.8 \mm
 }
@@ -171,8 +171,11 @@ smallerPaper = \layout {
   ragged-bottom = ##t
   indent = 7. \mm
   line-width =183.5 \mm
-  between-system-space = 25\mm 
-  between-system-padding = 0\mm
+  obsolete-between-system-space = 25\mm
+  system-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+  system-system-spacing #'padding = #0
+  score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+  score-system-spacing #'padding = #0
   system-count = 6
 
 %%  annotatespacing = ##t
@@ -182,7 +185,7 @@ smallerPaper = \layout {
   \score{
     \sarabandeCelloStaff
     \layout { }
-    
+
   \midi {
     \context {
       \Score
@@ -192,7 +195,7 @@ smallerPaper = \layout {
 
 
     \header{
-      opus= "" 
+      opus= ""
       piece ="Sarabande" }
   }
 }
diff --git a/input/regression/mozart-hrn-3.ly b/input/regression/mozart-hrn-3.ly
index bcdc1834e2..6f899348cf 100644
--- a/input/regression/mozart-hrn-3.ly
+++ b/input/regression/mozart-hrn-3.ly
@@ -14,7 +14,7 @@
   style = "classical"
   maintainer = "hanwen@xs4all.nl"
   maintainerEmail = "hanwen@xs4all.nl"
-  maintainerWeb = "http://www.xs4all.nl/~hanwen/"	
+  maintainerWeb = "http://www.xs4all.nl/~hanwen/"
   lastupdated = "2002/May/21"
   source = "Edition Breitkopf 2563"
   footer = "Mutopia-2002/05/21-25"
@@ -36,11 +36,11 @@
   texidoc="
 This is the Mozart 3 for horn.  It's from an Edition Breitkopf EB
 2563, edited by Henri Kling. Henri Kling (1842-1918) was a horn
-virtuoso that taught in Geneva. 
+virtuoso that taught in Geneva.
 "
 }
 
-\version "2.12.0"
+\version "2.13.46"
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"
@@ -48,7 +48,9 @@ virtuoso that taught in Geneva.
 \include "mozart-hrn3-rondo.ily"
 
 \paper {
-    between-system-space = 20 \mm
+    obsolete-between-system-space = 20 \mm
+    system-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+    score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
 }
 
 
@@ -56,8 +58,8 @@ virtuoso that taught in Geneva.
     \score {
 	{ \transpose c' bes \allegro }
 	\layout { }
-	\header { piece = "Allegro" opus = "" }	
-	
+	\header { piece = "Allegro" opus = "" }
+
   \midi {
     \context {
       \Score
@@ -70,8 +72,8 @@ virtuoso that taught in Geneva.
 
     \score {
 	{ \transpose c' bes \romanze }
-	\header { piece = "Romanze" opus = "" }	
-	
+	\header { piece = "Romanze" opus = "" }
+
   \midi {
     \context {
       \Score
@@ -87,7 +89,7 @@ virtuoso that taught in Geneva.
     {
 	{ \transpose c' bes \rondo }
 	\header { piece = "Rondo" opus = "" }
-	
+
   \midi {
     \context {
       \Score
diff --git a/input/regression/page-spacing.ly b/input/regression/page-spacing.ly
index 2edfdafdb4..2925023b63 100644
--- a/input/regression/page-spacing.ly
+++ b/input/regression/page-spacing.ly
@@ -13,7 +13,7 @@ By setting @code{annotate-spacing}, we can see the effect of each property.
 
 }
 
-\version "2.12.0"
+\version "2.13.46"
 
 #(set-global-staff-size 11)
 
@@ -40,9 +40,9 @@ By setting @code{annotate-spacing}, we can see the effect of each property.
 	    "Stretchable space runs between refpoints"
 	  }
 	}
-	
+
 	\break
-	
+
 	\overrideProperty
 	#"Score.NonMusicalPaperColumn"
 	#'line-break-system-details
@@ -57,7 +57,7 @@ By setting @code{annotate-spacing}, we can see the effect of each property.
 	c\break
 	\overrideProperty
 	#"Score.NonMusicalPaperColumn" #'line-break-system-details
-	#'((bottom-space . 25.0)) 
+	#'((bottom-space . 25.0))
 	c_"25 staff space to the bottom of the page. (property bottom-space)"\break
 
 
@@ -68,12 +68,14 @@ By setting @code{annotate-spacing}, we can see the effect of each property.
   \paper {
     ragged-last-bottom = ##f
     annotate-spacing = ##t
-    between-system-space = 1.0
+    obsolete-between-system-space = 1.0
+    system-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
+    score-system-spacing #'basic-distance = #(/ obsolete-between-system-space staff-space)
     #(set! text-font-defaults
       (acons
        'font-size 6
        text-font-defaults)
-      
+
     )
   }
 }
diff --git a/input/regression/page-top-space.ly b/input/regression/page-top-space.ly
index fa1f9e0172..c9895d35d4 100644
--- a/input/regression/page-top-space.ly
+++ b/input/regression/page-top-space.ly
@@ -4,7 +4,7 @@
 first system can be forced to be uniform."
 
 }
-\version "2.12.0"
+\version "2.13.46"
 
 #(set-default-paper-size "a6")
 
@@ -22,7 +22,8 @@ first system can be forced to be uniform."
   }
 
   \paper {
-    page-top-space = 3 \cm
+    obsolete-page-top-space = 3 \cm
+    top-system-spacing #'basic-distance = #(/ obsolete-page-top-space staff-space)
   }
 }