Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / notation / spacing.itely

diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 180b562bbc5f0ef53ac2d965e8ee6dc3d29eb282..b2da6c861b26921356eda5d4693a56ebcffe418a 100644 (file)
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -1283,24 +1283,17 @@ block:
 @end example
 
 @item
-To set the staff size for a single staff within a system, set the
-staff's font-size and staff-space using units relative to the
-score's default staff size.  Using relative units prevents the
-proportion of staff sizes from being altered if the default staff
-size is modified with @code{set-global-staff-size} or
-@code{layout-set-staff-size}.
-
-For example, traditionally engraved chamber music scores with
-piano often used 7mm piano staves while the other staves were up
-to 5/7 as large (if space allowed), or down to 3/5 as large (if
-space was cramped).  To achieve the 5/7 proportion, use:
+To set the staff size for a single staff within a system, use the
+@code{\magnifyStaff} command.  For example, traditionally engraved
+chamber music scores with piano often used 7mm piano staves while
+the other staves were typically between 3/5 and 5/7 as large
+(between 60% and 71%).  To achieve the 5/7 proportion, use:
 
 @example
 \score @{
   <<
     \new Staff \with @{
-      fontSize = #(magnification->font-size 5/7)
-      \override StaffSymbol.staff-space = #5/7
+      \magnifyStaff #5/7
     @} @{ @dots{} @}
     \new PianoStaff @{ @dots{} @}
   >>
@@ -1314,8 +1307,7 @@ could use the following form:
 \score @{
   <<
     \new Staff \with @{
-      fontSize = -3
-      \override StaffSymbol.staff-space = #(magstep -3)
+      \magnifyStaff #(magstep -3)
     @} @{ @dots{} @}
     \new PianoStaff @{ @dots{} @}
   >>
@@ -2293,8 +2285,8 @@ Internals Reference:
 @emph{Non-staff lines} (such as @code{Lyrics}, @code{ChordNames},
 etc.) are contexts whose layout objects are engraved like staves
 (i.e. in horizontal lines within systems).  Specifically,
-non-staff lines are non-staff contexts that create the
-@code{VerticalAxisGroup} layout object.
+non-staff lines are non-staff contexts that contain the
+@rinternals{Axis_group_engraver}.
 
 The following properties affect the spacing of non-staff lines:
 
@@ -2679,7 +2671,7 @@ Snippets:
 * Horizontal spacing overview::
 * New spacing area::
 * Changing horizontal spacing::
-* Line length::
+* Line width::
 * Proportional notation::
 @end menu
 
@@ -2932,8 +2924,8 @@ Snippets:
 @rlsr{Spacing}.
 
 
-@node Line length
-@subsection Line length
+@node Line width
+@subsection Line width
 
 @cindex page breaks
 @cindex breaking pages