From: Mark Polesky <markpolesky@yahoo.com>
Date: Sat, 13 Nov 2010 01:18:13 +0000 (-0800)
Subject: vert. spacing: Convert affected docs.
X-Git-Tag: release/2.13.39-1~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f9d5da211c4752be143ead221037cd58654b2faa;p=lilypond.git

vert. spacing: Convert affected docs.
---

diff --git a/Documentation/de/essay/engraving.itely b/Documentation/de/essay/engraving.itely
index 3876861981..1da15d44dd 100644
--- a/Documentation/de/essay/engraving.itely
+++ b/Documentation/de/essay/engraving.itely
@@ -9,7 +9,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.4"
+@c \version "2.13.39"
 
 @c Translators: Till Paala
 
@@ -885,7 +885,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
@@ -1823,7 +1823,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
diff --git a/Documentation/de/learning/fundamental.itely b/Documentation/de/learning/fundamental.itely
index 28253279aa..bd2b32908e 100644
--- a/Documentation/de/learning/fundamental.itely
+++ b/Documentation/de/learning/fundamental.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.12.0"
+@c \version "2.13.39"
 @c Translators: Till Paala, Reinhold Kainhofer
 
 @node Grundbegriffe
@@ -3124,7 +3124,7 @@ sind.
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" \with @{
         \override VerticalAxisGroup
-          #'next-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((space . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)
                                     (stretchability . 5))
@@ -3193,7 +3193,7 @@ PedalOrganMusic = \relative c {
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" \with {
         \override VerticalAxisGroup
-          #'next-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((space . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)
                                     (stretchability . 5))
diff --git a/Documentation/de/notation/spacing.itely b/Documentation/de/notation/spacing.itely
index 42c531aae7..6c7d37a239 100644
--- a/Documentation/de/notation/spacing.itely
+++ b/Documentation/de/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes.
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @c Translators: Till Paala
 
@@ -1483,7 +1483,7 @@ den Systemen verteilt.
 @unnumberedsubsubsec Abstand zwischen Notensystemen
 
 Abstand zwischen Notensystemen wird durch die Eigenschaft
-@code{next-staff-spacing} des @code{VerticalAxisGroup}-Grobs kontrolliert.
+@code{staff-staff-spacing} des @code{VerticalAxisGroup}-Grobs kontrolliert.
 Diese Eigenschaft ist eine Aliste mit vier Elementen: @var{Abstand},
 @var{minimum-distance}, @var{Verschiebung} und @var{Dehnbarkeit}:
 
@@ -1521,20 +1521,20 @@ einen Wert von @code{Abstand - minimum-distance}.
   % Since space is small and there is no minimum-distance, the distance
   % between this staff and the next will be determined by padding.
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((space . 1) (padding . 1))
   }
   { \clef bass c, }
   % Since space is small and nothing sticks out very far, the distance
   % between this staff and the next will be determined by minimum-distance.
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((space . 1) (minimum-distance . 12))
   }
   { \clef bass c, }
   % By setting padding to a negative value, staves can be made to collide.
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((space . 4) (padding . -10))
   }
   { \clef bass c, }
@@ -1546,24 +1546,24 @@ In Orchester- und großen Partituren werden Systeme normalerweise gruppiert.
 Der Abstand zwischen den Gruppen ist normalerweise größer als der Abstand
 zwischen Notensystemen der selben Gruppe.  Der Abstand kann mit dem
 @code{StaffGrouper}-Grob beeinflusst werden:  Der Standardwert von
-@code{next-staff-spacing} für @code{VerticalAxisGroup} ist eine
+@code{staff-staff-spacing} für @code{VerticalAxisGroup} ist eine
 Callback-Funktion, die nach einem @code{StaffGrouper}-Grob sucht, der ein
 Notensystem enthält.  Wenn sie einen @code{StaffGrouper}-Grob findet und
 das hierin enthaltene System ist in der Mitte einer Gruppe, wird der
-Wert von @code{between-staff-spacing} von @code{StaffGrouper} ausgelesen
+Wert von @code{staff-staff-spacing} von @code{StaffGrouper} ausgelesen
 und ausgegeben.  Wenn das enthaltene Notensystem das letzte einer Gruppe
-ist, wird die @code{after-last-staff-spacing}-Eigenschaft von @code{StaffGrouper}
+ist, wird die @code{staffgroup-staff-spacing}-Eigenschaft von @code{StaffGrouper}
 ausgelesen und ausgegeben.  Wenn kein @code{StaffGrouper}-Grob gefunden
-wird, wird @var{default-next-staff-spacing} aus der jeweiligen
+wird, wird @var{default-staff-staff-spacing} aus der jeweiligen
 @code{VerticalAxisGroup} ausgelesen und ausgegeben.
 
 @lilypond[verbatim]
 #(set-global-staff-size 16)
 <<
   \new PianoStaff \with {
-    \override StaffGrouper #'between-staff-spacing #'space = #1
-    \override StaffGrouper #'between-staff-spacing #'padding = #0
-    \override StaffGrouper #'after-last-staff-spacing #'space = #20
+    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'padding = #0
+    \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
   }
   <<
     \new Staff c'1
@@ -1571,8 +1571,8 @@ wird, wird @var{default-next-staff-spacing} aus der jeweiligen
   >>
 
   \new StaffGroup \with {
-    \override StaffGrouper #'between-staff-spacing #'space = #1
-    \override StaffGrouper #'between-staff-spacing #'padding = #0
+    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'padding = #0
   }
   <<
     \new Staff c'1
@@ -1601,26 +1601,26 @@ definiert wird, wird es wie ein Nicht-Notensystem behandelt.
 
 Nicht-Notensystem-Zeilen lassen drei Eigenschaften für ihre Abstandseinstellungen
 zu.  Jede dieser Eigenschaften ist eine Aliste des gleichen Formats wie
-@code{next-staff-spacing} oben.
+@code{staff-staff-spacing} oben.
 
 @itemize
 
 @item
 Wenn die nächste Zeile in der Richtung von @code{staff-affinity} ein
-Notensystem ist, ergibt sich aus dem Wert von @code{inter-staff-spacing} der
+Notensystem ist, ergibt sich aus dem Wert von @code{nonstaff-relatedstaff-spacing} der
 Abstand zwischen dem Nicht-Notensystem und dem Notensystem.  Wenn
-@code{staff-affinity} @code{CENTER} ist, dann wird @code{inter-staff-spacing}
+@code{staff-affinity} @code{CENTER} ist, dann wird @code{nonstaff-relatedstaff-spacing}
 in beide Richtungen benutzt.
 
 @item
 Wenn die nächste Zeile in der Richtung von @code{staff-affinity} ein
 Nicht-Notensystem ist, ergibt sich aus dem Wert von
-@code{inter-loose-line-spacing} der Abstand zwischen den beiden
+@code{nonstaff-nonstaff-spacing} der Abstand zwischen den beiden
 Nicht-Notensystemen.
 
 @item
 Wenn die nächste Zeile der der entgegengesetzten Richtung von @code{staff-affinity}
-ein Notensystem ist, dann gibt @code{non-affinity-spacing} den Abstand
+ein Notensystem ist, dann gibt @code{nonstaff-unrelatedstaff-spacing} den Abstand
 zwischen dem Nicht-Notensystem und dem Notensystem.  Das kann benutzt
 werden, um einen Minimalabstand zwischen einer Gesangstextzeiel und dem
 dazugehörigen Notensystem zu verlangen.
@@ -1635,14 +1635,14 @@ dazugehörigen Notensystem zu verlangen.
     % By default, Lyrics are placed close together.  Here, we allow them to
     % be stretched more widely.
     \override VerticalAxisGroup
-      #'inter-loose-line-spacing #'stretchability = #1000
+      #'nonstaff-nonstaff-spacing #'stretchability = #1000
   }
 }
 
 \new StaffGroup
 <<
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing = #'((space . 30)) }
+    \override VerticalAxisGroup #'staff-staff-spacing = #'((space . 30)) }
     { c'1 }
   \new Lyrics \with {
     \override VerticalAxisGroup #'staff-affinity = #UP }
diff --git a/Documentation/es/essay/engraving.itely b/Documentation/es/essay/engraving.itely
index a21a10e62a..0d351d3016 100644
--- a/Documentation/es/essay/engraving.itely
+++ b/Documentation/es/essay/engraving.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @node Grabado musical
 @chapter Grabado musical
@@ -889,7 +889,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
@@ -1833,7 +1833,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
diff --git a/Documentation/es/learning/fundamental.itely b/Documentation/es/learning/fundamental.itely
index 4a016b1e2f..8926639536 100644
--- a/Documentation/es/learning/fundamental.itely
+++ b/Documentation/es/learning/fundamental.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 
 @node Conceptos fundamentales
@@ -2948,7 +2948,7 @@ una forma similar.
 @cindex grobs
 
 El grado de ampliabilidad o separabilidad de los pentagramas se puede
-controlar con la propiedad @code{next-staff-spacing} del @q{objeto
+controlar con la propiedad @code{staff-staff-spacing} del @q{objeto
 gráfico} @code{VerticalAxisGroup} (los objetos gráficos reciben por lo
 general el nombre de @q{grob}s en la documentación de lilypond); no se
 preocupe por el momento de los detalles, pues esto se explica más
@@ -2981,7 +2981,7 @@ forma que los valores sean idénticos.
       >>  % % fin del contexto de Staff ManualUno
       \new Staff = "ManualDos" \with @{
         \override VerticalAxisGroup
-          #'next-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((space . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)
                                     (stretchability . 5))
@@ -3049,7 +3049,7 @@ PedalOrganMusic = \relative c {
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" \with {
         \override VerticalAxisGroup
-          #'next-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((space . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)
                                     (stretchability . 5))
diff --git a/Documentation/es/notation/spacing.itely b/Documentation/es/notation/spacing.itely
index 3efbfe70a3..3d7d3a325c 100644
--- a/Documentation/es/notation/spacing.itely
+++ b/Documentation/es/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @node Problemas de espaciado
 @chapter Problemas de espaciado
@@ -1545,7 +1545,7 @@ los nombres de acorde) se distribuyen entre las pautas.
 
 @unnumberedsubsubsec Espaciado entre los pentagramas
 El espaciado entre los pentagramas se controla mediante la propiedad
-@var{next-staff-spacing} del grob @var{VerticalAxisGroup}.  Esta
+@var{staff-staff-spacing} del grob @var{VerticalAxisGroup}.  Esta
 propiedad es una lista-A de cuatro elementos: @var{space},
 @var{minimum-distance}, @var{padding} y @var{stretchability}:
 @itemize
@@ -1584,20 +1584,20 @@ minimum-distance}.
   % Since space is small and there is no minimum-distance, the distance
   % between this staff and the next will be determined by padding.
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((space . 1) (padding . 1))
   }
   { \clef bass c, }
   % Since space is small and nothing sticks out very far, the distance
   % between this staff and the next will be determined by minimum-distance.
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((space . 1) (minimum-distance . 12))
   }
   { \clef bass c, }
   % By setting padding to a negative value, staves can be made to collide.
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((space . 4) (padding . -10))
   }
   { \clef bass c, }
@@ -1610,25 +1610,25 @@ En partituras grandes como las orquestales, es común colocar los
 pentagramas en grupos.  El espacio entre los grupos suele ser mayor
 que el espacio que hay entre los pentagramas dentro del mismo grupo.
 Este espacio se puede manipular con el grob @var{StaffGrouper}: el
-valor predeterminado de @var{next-staff-spacing} para
+valor predeterminado de @var{staff-staff-spacing} para
 @var{VerticalAxisGroup} es una función de @q{callback} que opera por
 el procedimiento de buscar un grob @var{StaffGrouper} que contenga al
 pentagrama.  Si encuentra un grob @var{StaffGrouper} y el pentagrama
 en cuestión está en mitad de un grupo, lee la propiedad
-@var{between-staff-spacing} de @var{StaffGrouper} y la devuelve.  Si
+@var{staff-staff-spacing} de @var{StaffGrouper} y la devuelve.  Si
 el pentagrama en cuestión es el último de un grupo, la función de
-@q{callback} lee la propiedad @var{after-last-staff-spacing} de
+@q{callback} lee la propiedad @var{staffgroup-staff-spacing} de
 @var{StaffGrouper} y la devuelve.  Si no encuentra un grob
-@var{StaffGrouper}, lee @var{default-next-staff-spacing} a partir de
+@var{StaffGrouper}, lee @var{default-staff-staff-spacing} a partir de
 su @var{VerticalAxisGroup} y lo devuelve.
 
 @lilypond[verbatim]
 #(set-global-staff-size 16)
 <<
   \new PianoStaff \with {
-    \override StaffGrouper #'between-staff-spacing #'space = #1
-    \override StaffGrouper #'between-staff-spacing #'padding = #0
-    \override StaffGrouper #'after-last-staff-spacing #'space = #20
+    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'padding = #0
+    \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
   }
   <<
     \new Staff c'1
@@ -1636,8 +1636,8 @@ su @var{VerticalAxisGroup} y lo devuelve.
   >>
 
   \new StaffGroup \with {
-    \override StaffGrouper #'between-staff-spacing #'space = #1
-    \override StaffGrouper #'between-staff-spacing #'padding = #0
+    \override StaffGrouper #'staff-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'padding = #0
   }
   <<
     \new Staff c'1
@@ -1668,23 +1668,23 @@ no fuera una pauta.
 
 Las líneas que no son pautas admiten tres propiedades para controlar
 su espaciado.  Cada una de estas propiedades es una lista-A del mismo
-formato que @var{next-staff-spacing}, véase más arriba.
+formato que @var{staff-staff-spacing}, véase más arriba.
 @itemize
 @item
 Si la línea más cercana en la dirección de @var{staff-affinity} es una
-pauta, entonces @var{inter-staff-spacing} da el espacio entre la línea
+pauta, entonces @var{nonstaff-relatedstaff-spacing} da el espacio entre la línea
 que no es una pauta y la pauta.  Si @var{staff-affinity} es
-@code{CENTER}, entonces se usa @var{inter-staff-spacing} para las dos
+@code{CENTER}, entonces se usa @var{nonstaff-relatedstaff-spacing} para las dos
 direcciones.
 
 @item
 Si línea más cercana en la dirección de @var{staff-affinity} no es una
-pauta, entonces @var{inter-loose-line-spacing} da el espaciado entre
+pauta, entonces @var{nonstaff-nonstaff-spacing} da el espaciado entre
 las dos líneas que no son pautas.
 
 @item
 Si la línea más cercana en la dirección opuesta a @var{staff-affinity}
-es una pauta, entonces @var{non-affinity-spacing} da el espacio entre
+es una pauta, entonces @var{nonstaff-unrelatedstaff-spacing} da el espacio entre
 la línea que no es una pauta y la pauta.  esto se puede usar, por
 ejemplo, para requerir una cantidad de relleno mínima entre una línea
 de letra y el pentagrama a que no pertenece.
@@ -1698,14 +1698,14 @@ de letra y el pentagrama a que no pertenece.
     % By default, Lyrics are placed close together.  Here, we allow them to
     % be stretched more widely.
     \override VerticalAxisGroup
-      #'inter-loose-line-spacing #'stretchability = #1000
+      #'nonstaff-nonstaff-spacing #'stretchability = #1000
   }
 }
 
 \new StaffGroup
 <<
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing = #'((space . 30)) }
+    \override VerticalAxisGroup #'staff-staff-spacing = #'((space . 30)) }
     { c'1 }
   \new Lyrics \with {
     \override VerticalAxisGroup #'staff-affinity = #UP }
diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely
index 5650e87c78..dc11bbb4d1 100644
--- a/Documentation/essay/engraving.itely
+++ b/Documentation/essay/engraving.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @node Music engraving
 @chapter Music engraving
@@ -830,7 +830,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
@@ -1727,7 +1727,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
diff --git a/Documentation/fr/essay/engraving.itely b/Documentation/fr/essay/engraving.itely
index ec3a054d7e..5535adeb65 100644
--- a/Documentation/fr/essay/engraving.itely
+++ b/Documentation/fr/essay/engraving.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @c Translators: Jean-Charles Malahieude, John Mandereau, Gauvain Pocentek
 @c Translation checkers: 
@@ -891,7 +891,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
@@ -1825,7 +1825,7 @@ partIV = \relative c {
     }
     \context {
       \PianoStaff
-      \override StaffGrouper #'between-staff-spacing #'padding = #1
+      \override StaffGrouper #'staff-staff-spacing #'padding = #1
     }
   }
 }
diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely
index 18868279b9..dbf1021082 100644
--- a/Documentation/learning/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @node Fundamental concepts
 @chapter Fundamental concepts
@@ -2837,7 +2837,7 @@ the pedal staff should behave similarly.
 @cindex grobs
 
 Stretchability of staves can be controlled with the
-@code{next-staff-spacing} property of the @code{VerticalAxisGroup}
+@code{staff-staff-spacing} property of the @code{VerticalAxisGroup}
 @q{graphical object} (commonly called @q{grob}s within the lilypond
 documentation) -- don't worry about the details right now; this is
 fully explained later.  For the curious, have a look at
@@ -2869,7 +2869,7 @@ identical.
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" \with @{
         \override VerticalAxisGroup
-          #'next-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((space . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)
                                     (stretchability . 5))
@@ -2936,7 +2936,7 @@ PedalOrganMusic = \relative c {
       >>  % end ManualOne Staff context
       \new Staff = "ManualTwo" \with {
         \override VerticalAxisGroup
-          #'next-staff-spacing = #'((space . 9)
+          #'staff-staff-spacing = #'((space . 9)
                                     (minimum-distance . 8)
                                     (padding . 1)
                                     (stretchability . 5))
diff --git a/Documentation/notation/changing-defaults.itely b/Documentation/notation/changing-defaults.itely
index f4e574633c..bd2d48c840 100644
--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @node Changing defaults
 @chapter Changing defaults
@@ -1997,7 +1997,7 @@ If an alist is a grob property or @code{\paper} variable, its keys
 can be modified individually without affecting other keys.
 
 For example, to reduce the space between adjacent staves in a
-system, use the @code{between-staff-spacing} property of the
+system, use the @code{staff-staff-spacing} property of the
 @code{StaffGrouper} grob.  The property is an alist with four
 keys: @code{padding}, @code{space}, @code{minimum-distance}, and
 @code{stretchability}.  Three of the four keys have initialized
@@ -2005,7 +2005,7 @@ default values, which are defined (along with all the other grob
 properties) in the file @file{scm/define-grobs.scm}:
 
 @example
-(between-staff-spacing . ((padding . 1)
+(staff-staff-spacing . ((padding . 1)
                           (space . 9)
                           (minimum-distance . 7)))
 @end example
@@ -2024,7 +2024,7 @@ individually, use a nested declaration:
 
 % reduced space between staves
 \new PianoStaff \with {
-  \override StaffGrouper #'between-staff-spacing #'space = #7
+  \override StaffGrouper #'staff-staff-spacing #'space = #7
 } <<
   \new Staff { \clef treble c''1 }
   \new Staff { \clef bass   c1   }
@@ -2043,7 +2043,7 @@ be completely re-defined with one declaration, as an alist:
 
 @lilypond[quote,verbatim]
 \new PianoStaff \with {
-  \override StaffGrouper #'between-staff-spacing =
+  \override StaffGrouper #'staff-staff-spacing =
     #'((padding . 0)
        (space . 0)
        (minimum-distance . 0)
@@ -2056,16 +2056,16 @@ be completely re-defined with one declaration, as an alist:
 
 Note that any keys not explicitly listed in the alist definition
 will be reset to their @emph{default-when-unset} values.  In the
-case of @code{between-staff-spacing}, any unset key-values would
+case of @code{staff-staff-spacing}, any unset key-values would
 be reset to zero (except @code{stretchability}, which takes the
 value of @code{space} when unset).  Thus the following two
 declarations are equivalent:
 
 @example
-\override StaffGrouper #'between-staff-spacing =
+\override StaffGrouper #'staff-staff-spacing =
   #'((space . 7))
 
-\override StaffGrouper #'between-staff-spacing =
+\override StaffGrouper #'staff-staff-spacing =
   #'((padding . 0)
      (space . 7)
      (minimum-distance . 0)
diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 3d156965e4..9b96675327 100644
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.13.36"
+@c \version "2.13.39"
 
 @ignore
 GDP TODO list
@@ -1523,8 +1523,8 @@ of these reference points:
 #(define zero-space '((padding . -inf.0) (space . 0)))
 
 alignToZero = \with {
-  \override VerticalAxisGroup #'inter-staff-spacing = #zero-space
-  \override VerticalAxisGroup #'inter-loose-line-spacing = #zero-space
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #zero-space
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing = #zero-space
 }
 lowerCaseChords = \with {
   chordNameLowercaseMinor = ##t
@@ -1609,11 +1609,11 @@ individually, and the second completely re-defines the property:
 
 @example
 \new Staff \with @{
-  \override VerticalAxisGroup #'next-staff-spacing #'space = #10
+  \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
 @} @{ @dots{} @}
 
 \new Staff \with @{
-  \override VerticalAxisGroup #'next-staff-spacing =
+  \override VerticalAxisGroup #'staff-staff-spacing =
     #'((padding . 1)
        (space . 10)
        (minimum-distance . 9)
@@ -1628,7 +1628,7 @@ To change any spacing settings globally, put them in the
 \layout @{
   \context @{
     \Staff
-    \override VerticalAxisGroup #'next-staff-spacing #'space = #10
+    \override VerticalAxisGroup #'staff-staff-spacing #'space = #10
   @}
 @}
 @end example
@@ -1639,13 +1639,13 @@ in @file{scm/define-grobs.scm}:
 @itemize
 @item @code{StaffGrouper} properties:
 @itemize
-@item @code{between-staff-spacing}
-@item @code{after-last-staff-spacing}
+@item @code{staff-staff-spacing}
+@item @code{staffgroup-staff-spacing}
 @end itemize
 @item @code{VerticalAxisGroup} properties:
 @itemize
-@item @code{default-next-staff-spacing}
-@item @code{non-affinity-spacing}
+@item @code{default-staff-staff-spacing}
+@item @code{nonstaff-unrelatedstaff-spacing}
 @end itemize
 @end itemize
 
@@ -1660,23 +1660,23 @@ found in the relevant context definitions in
 @code{\override} at the @code{Staff} level (or equivalent).
 
 @table @code
-@item next-staff-spacing
+@item staff-staff-spacing
 The distance between the current staff and the staff just below it
 in the same system, even if one or more non-staff lines (such as
 @code{Lyrics}) are placed between the two staves.  Does not apply
 to the bottom staff of a system.  For a grouped staff, if
-@code{next-staff-spacing} is set, it will be used instead of the
+@code{staff-staff-spacing} is set, it will be used instead of the
 relevant @code{StaffGrouper} property
-(@code{between-staff-spacing} or @code{after-last-staff-spacing}).
-If unset, the @code{default-next-staff-spacing} property is used,
+(@code{staff-staff-spacing} or @code{staffgroup-staff-spacing}).
+If unset, the @code{default-staff-staff-spacing} property is used,
 unless the staff is part of a staff-group and the appropriate
 @code{StaffGrouper} property is set.
 
-@item default-next-staff-spacing
-The value to use for @code{next-staff-spacing} when it is unset,
+@item default-staff-staff-spacing
+The value to use for @code{staff-staff-spacing} when it is unset,
 for ungrouped staves and for grouped staves that do not have the
 relevant @code{StaffGrouper} property set
-(@code{between-staff-spacing} or @code{after-last-staff-spacing}).
+(@code{staff-staff-spacing} or @code{staffgroup-staff-spacing}).
 
 @item staff-affinity
 The direction of the staff to use for spacing the current
@@ -1696,22 +1696,22 @@ cause it to be treated as a non-staff line.
 
 @c TODO: verify last clause below ("even if other...")
 
-@item inter-staff-spacing
+@item nonstaff-relatedstaff-spacing
 The distance between the current non-staff line and the nearest
 staff in the direction of @code{staff-affinity}, if there are no
 non-staff lines between the two, and @code{staff-affinity} is
 either @code{UP} or @code{DOWN}.  If @code{staff-affinity} is
-@code{CENTER}, then @code{inter-staff-spacing} is used for the
+@code{CENTER}, then @code{nonstaff-relatedstaff-spacing} is used for the
 nearest staves on @emph{both} sides, even if other non-staff lines
 appear between the current one and either of the staves.
 
-@item inter-loose-line-spacing
+@item nonstaff-nonstaff-spacing
 The distance between the current non-staff line and the next
 non-staff line in the direction of @code{staff-affinity}, if both
 are on the same side of the reference staff, and
 @code{staff-affinity} is either @code{UP} or @code{DOWN}.
 
-@item non-affinity-spacing
+@item nonstaff-unrelatedstaff-spacing
 The distance between the current non-staff line and the staff in
 the opposite direction from @code{staff-affinity}, if there are no
 other non-staff lines between the two, and @code{staff-affinity}
@@ -1727,25 +1727,25 @@ example, to require a minimum amount of padding between a
 @code{\override} at the @code{StaffGroup} level (or equivalent).
 
 @table @code
-@item between-staff-spacing
+@item staff-staff-spacing
 The distance between consecutive staves within the current
-staff-group.  The @code{next-staff-spacing} property of an
+staff-group.  The @code{staff-staff-spacing} property of an
 individual staff's @code{VerticalAxisGroup} grob will be used
 instead for any staves in the staff-group that have it set.  If
-both @code{between-staff-spacing} and @code{next-staff-spacing}
-are unset, the @code{default-next-staff-spacing} property of each
+both @code{staff-staff-spacing} and @code{staff-staff-spacing}
+are unset, the @code{default-staff-staff-spacing} property of each
 staff's @code{VerticalAxisGroup} grob is used.
 
-@item after-last-staff-spacing
+@item staffgroup-staff-spacing
 The distance between the last staff of the current staff-group and
 the staff just below it in the same system, even if one or more
 non-staff lines (such as @code{Lyrics}) exist between the two
 staves.  Does not apply to the bottom staff of a system.  The
-@code{next-staff-spacing} property of an individual staff's
+@code{staff-staff-spacing} property of an individual staff's
 @code{VerticalAxisGroup} grob will be used instead for any staves
 in the staff-group that have it set.  If both
-@code{after-last-staff-spacing} and @code{next-staff-spacing} are
-unset, the @code{default-next-staff-spacing} property of each
+@code{staffgroup-staff-spacing} and @code{staff-staff-spacing} are
+unset, the @code{default-staff-staff-spacing} property of each
 staff's @code{VerticalAxisGroup} grob is used.
 @end table
 
@@ -1763,7 +1763,7 @@ staves:
 @itemize
 @item @code{VerticalAxisGroup} properties:
 @itemize
-@item @code{next-staff-spacing}
+@item @code{staff-staff-spacing}
 @end itemize
 @end itemize
 
@@ -1773,14 +1773,14 @@ These grob properties are described individually above; see
 Additional properties are involved for staves that are part of a
 staff-group; see @ref{Spacing of grouped staves}.
 
-The following example shows how the @code{next-staff-spacing}
+The following example shows how the @code{staff-staff-spacing}
 property can affect the spacing of ungrouped staves:
 
 @lilypond[verbatim,quote,staffsize=16]
 \layout {
   \context {
     \Staff
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . 1)
          (space . 8)
          (minimum-distance . 7))
@@ -1802,7 +1802,7 @@ property can affect the spacing of ungrouped staves:
   % By setting 'padding to a negative value, staves can be made to
   % collide.  The lowest acceptable value for 'space is 0.
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing =
+    \override VerticalAxisGroup #'staff-staff-spacing =
       #'((padding . -10)
          (space . 3.5))
   } { \clef bass g2 r | }
@@ -1828,13 +1828,13 @@ staff-groups:
 @itemize
 @item @code{VerticalAxisGroup} properties:
 @itemize
-@item @code{next-staff-spacing}
-@item @code{default-next-staff-spacing}
+@item @code{staff-staff-spacing}
+@item @code{default-staff-staff-spacing}
 @end itemize
 @item @code{StaffGrouper} properties:
 @itemize
-@item @code{between-staff-spacing}
-@item @code{after-last-staff-spacing}
+@item @code{staff-staff-spacing}
+@item @code{staffgroup-staff-spacing}
 @end itemize
 @end itemize
 
@@ -1848,14 +1848,14 @@ The following example shows how properties of the
 \layout {
   \context {
     \Score
-    \override StaffGrouper #'between-staff-spacing #'padding = #0
-    \override StaffGrouper #'between-staff-spacing #'space = #1
+    \override StaffGrouper #'staff-staff-spacing #'padding = #0
+    \override StaffGrouper #'staff-staff-spacing #'space = #1
   }
 }
 
 <<
   \new PianoStaff \with {
-    \override StaffGrouper #'after-last-staff-spacing #'space = #20
+    \override StaffGrouper #'staffgroup-staff-spacing #'space = #20
   } <<
     \new Staff { c'1 }
     \new Staff { c'1 }
@@ -1884,9 +1884,9 @@ The following properties affect the spacing of non-staff lines:
 @item @code{VerticalAxisGroup} properties:
 @itemize
 @item @code{staff-affinity}
-@item @code{inter-staff-spacing}
-@item @code{inter-loose-line-spacing}
-@item @code{non-affinity-spacing}
+@item @code{nonstaff-relatedstaff-spacing}
+@item @code{nonstaff-nonstaff-spacing}
+@item @code{nonstaff-unrelatedstaff-spacing}
 @end itemize
 @end itemize
 
@@ -1894,7 +1894,7 @@ These grob properties are described individually above; see
 @ref{Within-system spacing properties}.
 
 The following example shows how the
-@code{inter-loose-line-spacing} property can affect the spacing of
+@code{nonstaff-nonstaff-spacing} property can affect the spacing of
 consecutive non-staff lines.  Here, by setting the
 @code{stretchability} key to a very high value, the lyrics are
 able to stretch much more than usual:
@@ -1904,14 +1904,14 @@ able to stretch much more than usual:
   \context {
     \Lyrics
     \override VerticalAxisGroup
-      #'inter-loose-line-spacing #'stretchability = #1000
+      #'nonstaff-nonstaff-spacing #'stretchability = #1000
   }
 }
 
 \new StaffGroup
 <<
   \new Staff \with {
-    \override VerticalAxisGroup #'next-staff-spacing = #'((space . 30))
+    \override VerticalAxisGroup #'staff-staff-spacing = #'((space . 30))
   } { c'1 }
   \new Lyrics \with {
     \override VerticalAxisGroup #'staff-affinity = #UP
diff --git a/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
index 8d64e7d202..bd389cf88b 100644
--- a/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/new/adjusting-lyrics-vertical-spacing.ly
@@ -1,4 +1,4 @@
-\version "2.13.36"
+\version "2.13.39"
 
 \header {
   lsrtags = "text, vocal-music, spacing"
@@ -27,7 +27,7 @@ This snippet shows how to bring the lyrics line closer to the staff.
     }
   }
   \new Lyrics \with {
-    \override VerticalAxisGroup #'inter-staff-spacing = #'((space . 1))
+    \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing = #'((space . 1))
   }
   \lyricsto melody { aa aa aa aa aa aa aa aa aa }
 >>