X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2Fstaff.itely;h=3f61028eda1fb3eb73dedc024536586046a6b2f3;hb=fcc93138815645e9ddd3270507c8649d0152cc6a;hp=297eea6f5506e73340dcdd1d02cad6c85c11d5ae;hpb=92639219fbef60744ab4c0a3c605507c3a4e3037;p=lilypond.git

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index 297eea6f55..3f61028eda 100644
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -6,40 +6,39 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.38"
+@c \version "2.11.51"
 
 @node Staff notation
 @section Staff notation
 
 @lilypondfile[quote]{staff-headword.ly}
 
-
-This section explains how to influence the staff appearance, 
-print scores with more than one staff, and 
-how to apply specific performance marks to single staves.
+This section explains how to influence the staff appearance, print
+scores with more than one staff, and how to apply specific
+performance marks to single staves.
 
 @menu
-* Displaying staves::           
-* Modifying single staves::     
-* Writing parts::               
+* Displaying staves::
+* Modifying single staves::
+* Writing parts::
 @end menu
 
 
 @node Displaying staves
 @subsection Displaying staves
 
-This section shows the different possibilities to create and group
-staves into groups, which can be marked in the beginning of each
-line with either a bracket or a brace.
+This section shows the different possibilities of creating and
+grouping staves, which are marked at the beginning of each line
+with either a bracket or a brace.
 
 @menu
 * Instantiating new staves::
-* Grouping staves:: 
-* Deeper nested staff groups::  
+* Grouping staves::
+* Deeper nested staff groups::
 @end menu
 
 @node Instantiating new staves
-@subsubsection Instantiating new staves
+@unnumberedsubsubsec Instantiating new staves
 
 @cindex new staff
 @cindex staff initiation
@@ -53,89 +52,91 @@ line with either a bracket or a brace.
 @cindex tabstaff
 @cindex tablature
 
-Staves (sg. staff) are created with the @code{\new} or
-@code{\context} commands.  For an explanation on these commands,
-see @ref{Creating contexts}.
+@notation{Staves} (singular: @notation{staff}) are created with
+the @code{\new} or @code{\context} commands.  For details, see
+@ref{Creating contexts}.
 
-There are different predefined staff contexts available in LilyPond:
+The basic staff context is @code{Staff}:
 
-@itemize
-@item
-The default is @code{Staff}:
-
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new Staff { c d e f }
+@lilypond[verbatim,quote,relative=2]
+\new Staff { c4 d e f }
 @end lilypond
 
-@item
-@code{DrumStaff} creates a five line staff set up for a typical drum set.
-It uses different names for each instrument.  The instrument names have to
-be set using the @code{drummode}.  See @ref{Percussion staves}.
+@code{DrumStaff} creates a five-line staff set up for a
+typical drum set.  It uses different names for each instrument.
+The instrument names are set using the @code{\drummode} command.
+For details, see @ref{Percussion staves}.
 
-@lilypond[verbatim,ragged-right,quote]
-\new DrumStaff { 
+@lilypond[verbatim,quote]
+\new DrumStaff {
   \drummode { cymc hh ss tomh }
 }
 @end lilypond
 
 @c FIXME: remove when mentioned in NR 2.8
-@item
-@code{GregorianTranscriptionStaff} sets up a staff to notate modern
-Gregorian chant.  It does not show bar lines.
+@code{GregorianTranscriptionStaff} creates a staff to notate
+modern Gregorian chant.  It does not show bar lines.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new GregorianTranscriptionStaff { c d e f }
+@lilypond[verbatim,quote,relative=2]
+\new GregorianTranscriptionStaff { c4 d e f }
 @end lilypond
 
-@item
-@code{RhythmicStaff} can be used to show the rhythm of some music.  The
-notes are printed on one line regardless of their pitch, but the duration
-is preserved.  See @ref{Showing melody rhythms}.
+@code{RhythmicStaff} creates a single-line staff that only
+displays the rhythmic values of the input.  Real durations are
+preserved. For details, see @ref{Showing melody rhythms}.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new RhythmicStaff { c d e f }
+@lilypond[verbatim,quote,relative=2]
+\new RhythmicStaff { c4 d e f }
 @end lilypond
 
-@item
-@code{TabStaff} creates by default a tablature with six strings in 
-standard guitar tuning.  See @ref{Guitar tablatures}.
+@code{TabStaff} creates a tablature with six strings in standard
+guitar tuning.  For details, see @ref{Default tablatures}.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
-\new TabStaff { c d e f }
+@lilypond[verbatim,quote,relative=2]
+\new TabStaff { c4 d e f }
 @end lilypond
 
-@end itemize
-
-@noindent
-Besides these staves there are two staff contexts specific for the notation
-of ancient music: @code{MensuralStaff} and @code{VaticanaStaff}.  They are
+There are two staff contexts specific for the notation of ancient
+music: @code{MensuralStaff} and @code{VaticanaStaff}.  They are
 described in @ref{Pre-defined contexts}.
 
-Once a staff is instantiated it can be started or stopped at every point
-in the score.  This is done with the commands @code{\startStaff} and 
-@code{\stopStaff}.  How to use it is explained in @ref{Staff symbol}.
+Staves can be started or stopped at any point in the score.  The
+commands @code{\startStaff} and @code{\stopStaff} are used for
+this purpose.  For details, see @ref{Staff symbol}.
 
 
 @seealso
 
-Music Glossary: @rglos{staff}, @rglos{staves}.
+Music Glossary:
+@rglos{staff},
+@rglos{staves}.
 
-Notation Reference: @ref{Percussion staves}, 
-@ref{Guitar tablatures}, @ref{Gregorian Chant contexts},
-@ref{Mensural contexts}.
+Notation Reference:
+@ref{Creating contexts},
+@ref{Percussion staves},
+@ref{Default tablatures},
+@ref{Gregorian chant contexts},
+@ref{Mensural contexts},
+@ref{Staff symbol},
+@ref{Pre-defined contexts},
+@ref{Showing melody rhythms}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}
-
-Internals Reference: @internalsref{Staff}, @internalsref{DrumStaff},
-@internalsref{GregorianTranscriptionStaff}, @internalsref{RhythmicStaff},
-@internalsref{TabStaff}, @internalsref{MensuralStaff},
-@internalsref{VaticanaStaff}, @internalsref{StaffSymbol}.
+@rlsr{Staff notation}.
 
+Internals Reference:
+@rinternals{Staff},
+@rinternals{DrumStaff},
+@rinternals{GregorianTranscriptionStaff},
+@rinternals{RhythmicStaff},
+@rinternals{TabStaff},
+@rinternals{MensuralStaff},
+@rinternals{VaticanaStaff},
+@rinternals{StaffSymbol}.
 
 
 @node Grouping staves
-@subsubsection Grouping staves
+@unnumberedsubsubsec Grouping staves
 
 @cindex start of system
 @cindex staff, multiple
@@ -143,106 +144,85 @@ Internals Reference: @internalsref{Staff}, @internalsref{DrumStaff},
 @cindex system start delimiters
 @cindex bracket, vertical
 @cindex brace, vertical
+@cindex choir staff
 @cindex grand staff
 @cindex piano staff
 @cindex staff group
 @cindex staff, choir
-@cindex choir staff
+@cindex staff, piano
 @cindex system
 
-LilyPond provides different types of contexts to group single staves 
-together.  These contexts influence in the first place the appearance
-of the system start delimiter, but they have also influence on the
-behavior of the bar lines.
+Various contexts exist to group single staves together in order to
+form multi-stave systems.  Each grouping context sets the style of
+the system start delimiter and the behavior of bar lines.
 
-@itemize
-@item
-If no context is specified, the default properties for the score
-will be used: the group is started with a vertical line, and the
-bar lines are not connected.  The name of the beginning bar line 
-grob is @code{SystemStartBar}.  
+If no context is specified, the default properties will be used:
+the group is started with a vertical line, and the bar lines are
+not connected.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 <<
   \new Staff { c1 c }
-  \new Staff { c c }
+  \new Staff { c1 c }
 >>
 @end lilypond
 
-@item
-In a @code{StaffGroup}, the bar lines will be drawn through
-all the staves, and the group is started with a bracket.
+In the @code{StaffGroup} context, the group is started with a
+bracket and bar lines are drawn through all the staves.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \new StaffGroup <<
   \new Staff { c1 c }
-  \new Staff { c c }
+  \new Staff { c1 c }
 >>
 @end lilypond
 
-@item
-In a @code{ChoirStaff}, the group is 
-started with a bracket, but bar lines are not connected. 
+In a @code{ChoirStaff}, the group starts with a bracket, but bar
+lines are not connected.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \new ChoirStaff <<
   \new Staff { c1 c }
-  \new Staff { c c }
+  \new Staff { c1 c }
 >>
 @end lilypond
 
-@item
-In a @code{GrandStaff}, the group is started with a brace
-at the left, and bar lines are connected between the staves. 
+In a @code{GrandStaff}, the group begins with a brace, and bar
+lines are connected between the staves.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \new GrandStaff <<
   \new Staff { c1 c }
-  \new Staff { c c }
+  \new Staff { c1 c }
 >>
 @end lilypond
 
-@item
-The @code{PianoStaff} behaves almost as the @code{GrandStaff} but is
-optimized for setting piano music. In particular it supports the printing
-of an instrument name directly, see @ref{Instrument names}.
+The @code{PianoStaff} is almost identical to a @code{GrandStaff},
+except that it supports printing the instrument name directly.
+For details, see @ref{Instrument names}.
 
-@lilypond[verbatim,ragged-right,quote,fragment,relative=2]
+@lilypond[verbatim,quote,relative=2]
 \new PianoStaff <<
+  \set PianoStaff.instrumentName = "Piano"
+  \new Staff { c1 c }
   \new Staff { c1 c }
-  \new Staff { c c }
 >>
 @end lilypond
 
-@end itemize
-
 Each staff group context sets the property
-@code{systemStartDelimiter} to one of the values
-@code{SystemStartBar}, @code{SystemStartBrace},
-and @code{SystemStartBracket}.  A fourth delimiter,
-@code{systemStartSquare}, is also available, but must be
-instantiated manually.  The usage of this last delimiter is shown further
-down in the snippet section.
-
-According to classic engraver rules an orchestral score consists of
-staves connected only with a single line at the beginning of the system. 
-In LilyPond this is produced grouping the @code{Staff} contexts with
-@code{<< ... >>}.
-
-Each instrument family is grouped inside of a @code{StaffGroup} with a 
-starting bracket.  A group of same instruments or an instrument using
-more than one staff is grouped with braces in a @code{GrandStaff}.
-
-As the context names tell, @code{PianoStaff} is used for notating
-piano music and @code{ChoirStaff} for all kind of vocal ensemble music.
+@code{systemStartDelimiter} to one of the following values:
+@code{SystemStartBar}, @code{SystemStartBrace}, or
+@code{SystemStartBracket}.  A fourth delimiter,
+@code{SystemStartSquare}, is also available, but it must be
+explicitly specified.
 
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {use-square-bracket-at-the-start-of-a-staff-group.ly}
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {display-bracket-with-only-one-staff-in-a-system.ly}
 
 @cindex mensurstriche layout
@@ -250,40 +230,38 @@ piano music and @code{ChoirStaff} for all kind of vocal ensemble music.
 @cindex transcription of mensural music
 @cindex mensural music, transcription of
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {mensurstriche-layout-bar-lines-between-the-staves.ly}
 @c FIXME: move to NR 2.8.x when sectioning is ready
 
+
 @seealso
 
-Music Glossary: @rglos{brace}, 
-@rglos{bracket}, @rglos{grand staff}.
+Music Glossary:
+@rglos{brace},
+@rglos{bracket},
+@rglos{grand staff}.
+
+Notation Reference:
+@ref{Instrument names}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Staff}, @internalsref{ChoirStaff},
-@internalsref{GrandStaff}, @internalsref{PianoStaff}, 
-@internalsref{StaffGroup}, @internalsref{systemStartDelimiter},
-@internalsref{SystemStartBar}, @internalsref{SystemStartBrace},
-@internalsref{SystemStartBracket}, @internalsref{systemStartSquare}.
+Internals Reference:
+@rinternals{Staff},
+@rinternals{ChoirStaff},
+@rinternals{GrandStaff},
+@rinternals{PianoStaff},
+@rinternals{StaffGroup},
+@rinternals{SystemStartBar},
+@rinternals{SystemStartBrace},
+@rinternals{SystemStartBracket},
+@rinternals{SystemStartSquare}.
 
 
 @node Deeper nested staff groups
-@subsubsection Deeper nested staff groups
-
-There are also two inner staff contexts named @code{InnerStaffGroup}
-and @code{InnerChoirStaffGroup} besides the grouping contexts mentioned
-in @ref{Grouping staves}.  They behave in the same way as their simple
-counterparts, except that they are contained in another staff grouping
-context, thus producing one more bracket on top of the existing one. 
-Note that @code{GrandStaff} and @code{PianoStaff} do not have any inner
-grouping contexts.  They can both be inside any other staff context, 
-including inner staff groups, though.
-
-Here is an example of an orchestral score using groupings and nesting
-of these groupings.  Note that the instrument names are omitted from the
-source code, for instructions how to set them see @ref{Instrument names}.
+@unnumberedsubsubsec Deeper nested staff groups
 
 @cindex staff, nested
 @cindex staves, nested
@@ -295,120 +273,83 @@ source code, for instructions how to set them see @ref{Instrument names}.
 @cindex inner staff group
 @cindex inner choir staff group
 
+Two additional staff-group contexts are available that can be
+nested within a @code{StaffGroup} or @code{ChoirStaff} context:
+@code{InnerStaffGroup} and @code{InnerChoirStaff}.  These contexts
+create an additional bracket next to the original bracket of their
+parent staff group.
 
-@example
-\score @{ <<
-  \new StaffGroup %woodwinds
-  <<
-  \new Staff @{ c'1 d' @} %flute
-  \new InnerStaffGroup <<
-    \new Staff @{ c' d' @} %sax 
-    \new Staff @{ c' d' @} %oboe
-    \new Staff @{ c' d' @} %English horn
-    >>
-  \new Staff @{ \clef bass c d @} %bassoon
-  >>
-  \new StaffGroup %the brass group
-  <<
-    \new Staff @{ c' d' @} %trumpet
-    \new Staff @{ \clef bass c d @} %trombone
-    \new GrandStaff %the horns need a GrandStaff (same instrument)
-    <<
-      \new Staff @{ c' d' @}
-      \new Staff @{ \clef bass c d @}
-    >>
-  >>
-  \new ChoirStaff %for setting vocal music
-  <<
-   \new Staff @{ c' d' @}
-    \new InnerChoirStaff <<
-     \new Staff @{ c' d' @}
-     \new Staff @{ c' d' @}
-    >>
-   \new Staff @{ c' d' @}
-  >>
-  \new PianoStaff %for the piano
-  <<
-    \new Staff @{ c' d' @}
-    \new Staff @{\clef bass c d @}
-  >>
->> @}
-@end example
+An @code{InnerStaffGroup} is treated similarly to a
+@code{StaffGroup}; bar lines are connected between each stave
+within the context:
 
-@c no verbatim so instrument names are only in the music
-@lilypond[ragged-right,quote]
-\score { <<
-  \new StaffGroup %woodwinds
-  <<
-  \new Staff {\set Staff.instrumentName = "fl" c'1 d' } %flute
+@lilypond[verbatim,quote,relative=2]
+\new StaffGroup <<
+  \new Staff { c2 c }
   \new InnerStaffGroup <<
-    \new Staff { \set Staff.instrumentName = "sax" c' d' } %sax 1
-    \new Staff { \set Staff.instrumentName = "ob" c' d' } %sax 2
-    \new Staff { \set Staff.instrumentName = "ca" c' d' }
-    >>
-  \new Staff {\set Staff.instrumentName = "bs" \clef bass c d } %bassoon
-  >>
-  \new StaffGroup %the brass group
-  <<
-    \new Staff {\set Staff.instrumentName = "tr" c' d' } %trumpet
-    \new Staff {\set Staff.instrumentName = "tb" \clef bass c d } %trombone
-    \new GrandStaff %the horns need a GrandStaff (same instrument)
-    <<
-      \new Staff {\set Staff.instrumentName = "cor1" c' d' }
-      \new Staff {\set Staff.instrumentName = "cor2" \clef bass c d }
-    >>
+    \new Staff { g2 g }
+    \new Staff { e2 e }
   >>
-  \new ChoirStaff %for setting vocal music
-  <<
-   \new Staff {\set Staff.instrumentName = "S" c' d' }
-    \new InnerChoirStaff <<
-     \new Staff {\set Staff.instrumentName = "A1" c' d' }
-     \new Staff {\set Staff.instrumentName = "A2" c' d' }
-    >>
-   \new Staff {\set Staff.instrumentName = "T" c' d' }
-  >>
-  \new PianoStaff %for the piano
-  <<
-    \new Staff { c' d' }
-    \new Staff {\clef bass c d }
+>>
+@end lilypond
+
+Bar lines are @emph{not} connected between staves of an
+@code{InnerChoirStaff}, just like a @code{ChoirStaff}:
+
+@lilypond[verbatim,quote,relative=2]
+\new ChoirStaff <<
+  \new Staff { c2 c }
+  \new InnerChoirStaff <<
+    \new Staff { g2 g }
+    \new Staff { e2 e }
   >>
->> }
+  \new Staff { c1 }
+>>
 @end lilypond
 
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {nesting-staves.ly}
 
 
 @seealso
 
-Snippets:
-@lsrdir{Staff,Staff-notation}
+Notation Reference:
+@ref{Grouping staves},
+@ref{Instrument names}.
 
-Internals Reference: @internalsref{InnerChoirStaffGroup}, 
-@internalsref{InnerStaffGroup}, @internalsref{SystemStartBar}, 
-@internalsref{SystemStartBrace}, @internalsref{SystemStartBracket},
-@internalsref{systemStartDelimiterHierarchy}.
+Snippets:
+@rlsr{Staff notation}.
 
+Internals Reference:
+@rinternals{InnerStaffGroup},
+@rinternals{StaffGroup},
+@rinternals{InnerChoirStaff},
+@rinternals{ChoirStaff},
+@rinternals{SystemStartBar},
+@rinternals{SystemStartBrace},
+@rinternals{SystemStartBracket}.
 
 
 @node Modifying single staves
 @subsection Modifying single staves
 
-This section explains how to change specific attributes of one 
-staff like the staff lines, starting and stopping of staves, sizing
-of staves, and setting ossia sections.
+This section explains how to change specific attributes of one
+staff: for example, modifying the number of staff lines or the
+staff size.  Methods to start and stop staves and set ossia
+sections are also described.
 
 @menu
-* Staff symbol::   
-* Ossia staves::             
-* Hiding staves::    
+* Staff symbol::
+* Ossia staves::
+* Hiding staves::
 @end menu
 
+
 @node Staff symbol
-@subsubsection Staff symbol
+@unnumberedsubsubsec Staff symbol
 
 @cindex adjusting staff symbol
 @cindex drawing staff symbol
@@ -425,147 +366,142 @@ of staves, and setting ossia sections.
 @cindex spacing of ledger lines
 @cindex number of staff lines
 
-The layout object which draws the lines of a staff is called
-@code{staff symbol}.  The staff symbol may be tuned in number,
-thickness and distance of lines, using properties.  It may also
-be started and stopped at every point in the score.
+The grob @code{StaffSymbol} is responsible for drawing the lines
+of a staff.  Its properties can be altered in order to change the
+appearance of a staff, but they must be changed before the staff
+is created.  A staff may be started or stopped at any point in the
+score.
 
-@itemize
-@item
-Changing the number of staff lines is done by overriding 
-@code{line-count}.  You may need to adjust the clef position
-and the position of the middle C to fit to the new staff.  For
-an explanation, see the snippet section in @ref{Displaying pitches}.
+The number of staff lines may be changed.  The clef position and
+the position of middle C may need to be modified to fit the new
+staff.  For an explanation, refer to the snippet section in
+@ref{Clef}.
 
-@lilypond[verbatim,ragged-right,quote]
+@lilypond[verbatim,quote,relative=2]
 \new Staff {
-  \override Staff.StaffSymbol  #'line-count = #3
-  d d d d
+  \override Staff.StaffSymbol #'line-count = #3
+  d4 d d d
 }
 @end lilypond
 
-@item
-The placement and amount of the staff lines can also set totally 
-manually by defining their positions explicitly.  The middle
-of the staff has the value of 0, each half staff space up and down
-adds an integer.  The default values are 4 2 0 -2 -4.  Bar lines
-are drawn according to the calculated width of the system, but
-they are always centered.  As the
-example shows, the positions of the notes are not influenced
-by the position of the staff lines.
-
-@lilypond[verbatim,ragged-right,quote]
+The vertical position of staff lines and the number of staff lines
+can be defined at the same time.  As the example shows, the
+positions of the notes are not influenced by the position of the
+staff lines.  Details for modifying this property are found in
+@rinternals{staff-symbol-interface}.
+
+@warning{The @code{'line-positions} property overrides the
+@code{'line-count} property.  The number of staff lines is
+implicitly defined by the number of elements in the list of values
+for @code{'line-positions}}
+
+@lilypond[verbatim,quote,relative=1]
 \new Staff \with {
-  \override StaffSymbol #' line-positions = #' ( 7 3 0 -4 -6 -7 )
-  }{
-  a e' f' b' d''
+  \override StaffSymbol #'line-positions = #'(7 3 0 -4 -6 -7)
 }
+{ a4 e' f b | d1 }
 @end lilypond
 
-@item
-The staff line thickness can be set by overriding the @code{thickness}
-property.  Note that it gets applied also to ledger lines and stems, 
-since they depend on the staff line thickness.  The argument of 
-@code{thickness} is a factor of @code{line-thickness} which defaults
-to the normal staff line thickness.
+The staff line thickness can be modified.  The thickness of ledger
+lines and stems are also affected, since they depend on staff line
+thickness.
 
-@lilypond[verbatim,ragged-right,quote]
+@lilypond[verbatim,quote,relative=1]
 \new Staff \with {
   \override StaffSymbol #'thickness = #3
-  }{
-  d d d d
 }
+{ e4 d c b }
 @end lilypond
 
-@item
-The thickness of the ledger lines can also be set independent of the
-settings for staff lines.  The setting is calculated from a pair of
-values which will be added for the final thickness.  The first value 
-is the staff line thickness multiplied by a factor, the second is
-the staff space multiplied by a factor.  In the example the ledger
-lines get their thickness from one staff line thickness plus 1/5 
-staff space, so they are heavier than a normal staff line.
-
-@lilypond[verbatim,ragged-right,quote]
+The thickness of ledger lines can be set independently of staff
+line thickness.  A description of this property is also found in
+@rinternals{staff-symbol-interface}.
+
+@lilypond[verbatim,quote,relative=1]
 \new Staff \with {
-  \override StaffSymbol #'  ledger-line-thickness = #' ( 1 . 0.2 ) }
-  {
-  d d d d
+  \override StaffSymbol #'ledger-line-thickness = #'(1 . 0.2)
 }
+{ e4 d c b }
 @end lilypond
 
-@item
-The distance of the stafflines can be changed with the 
-@code{staff-space} property. Its argument is the amount
-of staff spaces that should be inserted between the lines.
-The default value is 1. Setting the distance has
-influence on the staff lines as well as on ledger lines.
+The distance between staff lines can be changed.  The setting has
+influence on ledger lines as well.
 
-@lilypond[verbatim,ragged-right,quote]
+@lilypond[verbatim,quote,relative=1]
 \new Staff \with {
-  \override StaffSymbol #' staff-space  = #1.5
-  }{
-  a b c' d'
+  \override StaffSymbol #'staff-space = #1.5
 }
+{ a4 b c d }
 @end lilypond
 
-@item
-The length of the staff line can also be adjusted
-manually.  The unit is one staff space.  Spacing 
-of the objects inside the staff does not get influenced 
+The width of a staff can be adjusted.  The unit is one staff
+space.  The spacing of objects inside the staff is not influenced
 by this setting.
 
-@lilypond[verbatim,ragged-right,quote]
+@lilypond[verbatim,quote,relative=1]
 \new Staff \with {
-  \override StaffSymbol #' width = #23
-  }{
-  a e' f' b' d''
+  \override StaffSymbol #'width = #23
 }
+{ a4 e' f b | d1 }
 @end lilypond
 
-@end itemize
+Modifications to staff properties in the middle of a score can be
+placed between @code{\stopStaff} and @code{\startStaff}:
 
-These properties can only be set before instantiating the staff symbol.
-But it is possible to start and stop staves in the middle of a score,
-so each new setting will be applied to the newly instantiated staff.
-
-@lilypond[verbatim,relative=2,fragment]
-b4 b
-%Set here the overrides for the staff 
-\override Staff.StaffSymbol #'line-count = 2
-\stopStaff \startStaff
-b b
-%Revert to the default
+@lilypond[verbatim,quote,relative=2]
+c2 c
+\stopStaff
+\override Staff.StaffSymbol #'line-count = #2
+\startStaff
+b2 b
+\stopStaff
 \revert Staff.StaffSymbol #'line-count
-\stopStaff \startStaff
-b b
+\startStaff
+a2 a
 @end lilypond
- 
+
+
 @predefined
 
-@code{\stopStaff}, @code{\startStaff}
+@funindex \startStaff
+@code{\startStaff},
+@funindex \stopStaff
+@code{\stopStaff}.
+
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {making-some-staff-lines-thicker-than-the-others.ly}
 
+
 @seealso
 
-Glossary: @rglos{line}, @rglos{ledger line}, @rglos{staff}.
+Music Glossary:
+@rglos{line},
+@rglos{ledger line},
+@rglos{staff}.
+
+Notation Reference:
+@ref{Displaying pitches}.
+
+Snippets:
+@rlsr{Staff notation}.
+
+Internals Reference:
+@rinternals{StaffSymbol},
+@rinternals{staff-symbol-interface}.
 
-Internals Reference: @internalsref{StaffSymbol}.
 
 @knownissues
 
-When setting staff lines manually, bar lines are
-always drawn centered on the position 0, so the
-maximum distance of the bar lines in either direction 
-must be equal.
+When setting staff lines manually, bar lines are always drawn
+centered on the position 0, so the maximum distance of the bar
+lines in either direction must be equal.
 
 
 @node Ossia staves
-@subsubsection Ossia staves
+@unnumberedsubsubsec Ossia staves
 
 @cindex staff, Frenched
 @cindex ossia
@@ -573,31 +509,99 @@ must be equal.
 @cindex staff, resizing of
 @cindex resizing of staves
 
-Tweaking the staff object allows to resize the staff:
+@notation{Ossia} staves can be set by creating a new simultaneous
+staff in the appropriate location:
 
-@lilypond[verbatim,ragged-right,quote]
-  \new Staff \with {
+@lilypond[verbatim,quote]
+\new Staff \relative c'' {
+  c4 b d c
+  <<
+    { c4 b d c }
+    \new Staff { e4 d f e }
+  >>
+  c4 b c2
+}
+@end lilypond
+
+However, the above example is usually not the desired result.  To
+create ossia staves that are above the original staff, have no
+time signature or clef, and have a smaller font size, tweaks must
+be used.  The Learning Manual describes a specific technique to
+achieve this goal, beginning with
+@rlearning{Nesting music expressions}.
+
+The following example uses the @code{alignAboveContext} property
+to align the ossia staff.  This method is most appropriate when
+only a few ossia staves are needed.
+
+@lilypond[verbatim,quote]
+\new Staff = main \relative c'' {
+  c4 b d c
+  <<
+    { c4 b d c }
+
+    \new Staff \with {
+      \remove "Time_signature_engraver"
+      alignAboveContext = #"main"
+      fontSize = #-3
+      \override StaffSymbol #'staff-space = #(magstep -3)
+      \override StaffSymbol #'thickness = #(magstep -3)
+      firstClef = ##f
+    }
+    { e4 d f e }
+  >>
+  c4 b c2
+}
+@end lilypond
+
+If many isolated ossia staves are needed, creating an empty
+@code{Staff} context with a specific @emph{context id} may be more
+appropriate; the ossia staves may then be created by
+@emph{calling} this context and using @code{\startStaff} and
+@code{\stopStaff} at the desired locations.  The benefits of this
+method are more apparent if the piece is longer than the following
+example.
+
+@lilypond[verbatim,quote,ragged-right]
+<<
+  \new Staff = ossia \with {
+    \remove "Time_signature_engraver"
+    \remove "Clef_engraver"
     fontSize = #-3
     \override StaffSymbol #'staff-space = #(magstep -3)
-    \override StaffSymbol #'thickness = # (magstep -3)
+    \override StaffSymbol #'thickness = #(magstep -3)
   }
-  {
-    \clef bass
-    c8 c c c  c c c c
+  { \stopStaff s1*6 }
+
+  \new Staff \relative c' {
+    c4 b c2
+    <<
+      { e4 f e2 }
+      \context Staff = ossia {
+        \startStaff e4 g8 f e2 \stopStaff
+      }
+    >>
+    g4 a g2 \break
+    c4 b c2
+    <<
+      { g4 a g2 }
+      \context Staff = ossia {
+        \startStaff g4 e8 f g2 \stopStaff
+      }
+    >>
+    e4 d c2
   }
+>>
 @end lilypond
 
-@noindent
-This involves shrinking the staff spaces, the staff lines and
-the font size by the factor 3.  You find a more precise explanation
-in @ref{Setting the staff size}.
+@c The following is the legacy "ossia.ly" example
+@c
+@c I don't think this method is very efficient.
+@c I'm commenting it out for now.  -pm
 
-The @emph{ossia} section in the next example are just put parallel
-to the main staff with @code{<<} and @code{>>} brackets.  The @emph{ossia}
-staff is stopped and started explicitely and white space is inserted 
-with the @code{\skip} command.
+@ignore
 
-@lilypond[verbatim,relative=2,quote]
+@ lilypond[verbatim,quote]
 <<
   \new Staff \with
   {
@@ -605,7 +609,7 @@ with the @code{\skip} command.
     \remove "Time_signature_engraver"
     fontSize = #-3
     \override StaffSymbol #'staff-space = #(magstep -3)
-    \override StaffSymbol #'thickness = # (magstep -3)
+    \override StaffSymbol #'thickness = #(magstep -3)
     firstClef = ##f
   }
   \relative c'' {
@@ -620,191 +624,249 @@ with the @code{\skip} command.
     s2
 
     \startStaff
-    f8 d g4 
+    f8 d g4
   }
-  \new Staff  \relative c'' {
+  \new Staff \relative c'' {
     \time 2/4
     c4 c g' g a a g2
   }
 >>
+@ end lilypond
+
+@end ignore
+
+Using the @code{\RemoveEmptyStaffContext} command to create ossia
+staves may be used as an alternative.  This method is most
+convenient when ossia staves occur immediately following a line
+break.  In this case, spacer rests do not need to be used at all;
+only @code{\startStaff} and @code{\stopStaff} are necessary.  For
+more information about @code{\RemoveEmptyStaffContext}, see
+@ref{Hiding staves}.
+
+@lilypond[verbatim,quote,ragged-right]
+<<
+  \new Staff = ossia \with {
+    \remove "Time_signature_engraver"
+    \remove "Clef_engraver"
+    fontSize = #-3
+    \override StaffSymbol #'staff-space = #(magstep -3)
+    \override StaffSymbol #'thickness = #(magstep -3)
+  }
+  \new Staff \relative c' {
+    c4 b c2
+    e4 f e2
+    g4 a g2 \break
+    <<
+      { c4 b c2 }
+      \context Staff = ossia {
+        c4 e8 d c2 \stopStaff
+      }
+    >>
+    g4 a g2
+    e4 d c2
+  }
+>>
+
+\layout {
+  \context {
+    \RemoveEmptyStaffContext
+    \override VerticalAxisGroup #'remove-first = ##t
+  }
+}
 @end lilypond
 
 
 @snippets
 
-@c  lilypondfile{Making-some-staff-lines-thicker-than-the-others.ly}
-@c snippet 277
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{vertically-aligning-ossias-and-lyrics.ly}
+
 
 @seealso
 
-Music Glossary: @rglos{ossia}, @rglos{staff}, @rglos{Frenched staff}.
+Music Glossary:
+@rglos{ossia},
+@rglos{staff},
+@rglos{Frenched staff}.
+
+Learning Manual:
+@rlearning{Nesting music expressions},
+@rlearning{Size of objects},
+@rlearning{Length and thickness of objects}.
+
+Notation Reference:
+@ref{Setting the staff size}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{StaffSymbol}.
+Internals Reference:
+@rinternals{StaffSymbol}.
 
 
 @node Hiding staves
-@subsubsection Hiding staves
+@unnumberedsubsubsec Hiding staves
 
 @cindex Frenched scores
 @cindex staff, hiding
-@cindex staff, empty 
+@cindex staff, empty
 @cindex hiding of staves
 @cindex empty staves
 @cindex Frenched staves
 
 In orchestral scores, staff lines that only have rests are usually
-removed; this saves some space.  This style is called @q{French
-Score}.  For the @code{Lyrics}, @code{ChordNames}, and
-@code{FiguredBass} contexts, this is switched on by default.  When
-the lines of these contexts turn out empty after the line-breaking
-process, they are removed.
-
-For normal staves this behaviour is called
-with the @code{\RemoveEmptyStaffContext} command.  It is set
-in the @code{\layout} block.  As a result staves containing 
-nothing or whole mesure rests are removed after a line break.
-
-@lilypond[quote,ragged-right,verbatim]
+removed in order to save some space.  This style is called
+@q{French Score}.  For the @code{Lyrics}, @code{ChordNames}, and
+@code{FiguredBass} contexts, this is switched on by default.
+
+For other staff contexts, this behavior is set with the
+@code{\RemoveEmptyStaffContext} command.  It is set in the
+@code{\layout} block.  As a result, empty staves or staves
+containing multi-measure rests are removed after a line break.
+
+@lilypond[verbatim,quote,ragged-right]
 \layout {
-  \context { \RemoveEmptyStaffContext }
+  \context {
+    \RemoveEmptyStaffContext
+  }
 }
 \relative c'' {
   <<
     \new Staff { e4 f g a \break c1 }
     \new Staff { c4 d e f \break R1 }
-  >>  
+  >>
 }
 @end lilypond
 
-
 To remove other types of contexts, use
 @code{\AncientRemoveEmptyStaffContext} or
 @code{\RemoveEmptyRhythmicStaffContext}.
 
 @cindex ossia
 
-Another application of the @code{\RemoveEmptyStaffContext} is to
-make ossia sections, i.e., alternative melodies on a separate
-piece of staff, with help of a Frenched staff.  See @ref{Ossia staves}. 
-
-You can make the staff lines invisible by removing the
-@code{Staff_symbol_engraver} from the @code{Staff} context.
+Another application of @code{\RemoveEmptyStaffContext} is to make
+ossia sections, i.e., alternative melodies on a separate piece of
+staff, with help of a Frenched staff.  For details, see
+@ref{Ossia staves}.
 
+Staff lines can be made invisible by removing the
+@code{Staff_symbol_engraver} from the @code{Staff} context:
 
-@lilypond[quote,ragged-right,verbatim]
-\score {
-  \context Staff \relative c'' { c8 c c16 c c c }
-  \layout{
-    \context {
-      \Staff
-      \remove Staff_symbol_engraver
-    }
-  }
+@lilypond[verbatim,quote]
+\new Staff \with {
+  \remove "Staff_symbol_engraver"
 }
+\relative c'' { c8 c c16 c c c c2 }
 @end lilypond
 
-@snippets
-
-The first empty staff can also be removed from the score with a 
-setting in the @code{VerticalAxisGroup} property.  This can be done 
-globally inside the @code{\layout} block, or locally inside the 
-specific staff that should be removed. In the latter case, 
-you have to specify the context (@code{Staff} applies only to the 
-current staff) in front of the property.
 
-The lower staff of the second staff group is not removed, 
-because the setting applies only to the specific staff inside 
-of which it is written.
+@snippets
 
-@lilypond[quote,ragged-right,verbatim,relative=2]
-\layout {
-  \context { 
-    \RemoveEmptyStaffContext 
-    %To use the setting globally, uncomment the following line:
-    %\override VerticalAxisGroup #'remove-first = ##t
-  }
-}
-\new StaffGroup
-  \relative c'' <<
-    \new Staff {    
-      e4 f g a \break c1 }
-    \new Staff {
-      %To use the setting globally, comment this line, uncomment the line above
-      \override Staff.VerticalAxisGroup #'remove-first = ##t
-      R1 \break R1 }
-  >>
-\new StaffGroup
-  <<
-    \new Staff { e4 f g a \break c1 }
-    \new Staff { R \break R1 }
-  >>
-@end lilypond
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{removing-the-first-empty-line.ly}
 
-@c FIXME not yet in master
-@c lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
-@c {remove-the-first-empy-line.ly}
 
 @predefined
 
+@funindex \RemoveEmptyStaffContext
 @code{\RemoveEmptyStaffContext},
+@funindex \AncientRemoveEmptyStaffContext
 @code{\AncientRemoveEmptyStaffContext},
-@code{\RemoveEmptyRhythmicStaffContext},
+@funindex \RemoveEmptyRhythmicStaffContext
+@code{\RemoveEmptyRhythmicStaffContext}.
+
 
 @seealso
 
-Notation Reference: @ref{Staff symbol}.
+Notation Reference:
+@ref{Staff symbol},
+@ref{Ossia staves}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}
+@rlsr{Staff notation}.
+
+Internals Reference:
+@rinternals{ChordNames},
+@rinternals{FiguredBass},
+@rinternals{Lyrics},
+@rinternals{Staff},
+@rinternals{VerticalAxisGroup}.
 
-Internals Reference: @internalsref{ChordNames},
-@internalsref{FiguredBass}, @internalsref{Lyrics},
-@internalsref{Staff}, @internalsref{VerticalAxisGroup}.
 
 @node Writing parts
 @subsection Writing parts
 
+This section explains how to insert tempo indications and
+instrument names into a score.  Methods to quote other voices and
+format cue notes are also described.
+
 @menu
-* Metronome marks::             
-* Instrument names::            
-* Quoting other voices::        
-* Formatting cue notes::        
+* Metronome marks::
+* Instrument names::
+* Quoting other voices::
+* Formatting cue notes::
 @end menu
 
+
 @node Metronome marks
-@subsubsection Metronome marks
+@unnumberedsubsubsec Metronome marks
 
-@cindex Tempo
+@cindex tempo
 @cindex beats per minute
 @cindex metronome marking
+@cindex metronome marking with text
+@funindex \tempo
 
-Metronome settings can be entered as follows
+Basic metronome markings can be entered as follows:
 
-@example
-\tempo @var{duration} = @var{per-minute}
-@end example
+@lilypond[verbatim,quote,relative=2]
+\tempo 2 = 120
+c1
+@end lilypond
 
-In the MIDI output, they are interpreted as a tempo change.  In
-the layout output, a metronome marking is printed
+Textual tempo indications can be used instead:
 
-@funindex \tempo
+@lilypond[verbatim,quote,relative=2]
+\tempo "Allegretto"
+d2 c
+@end lilypond
+
+The combination of a metronome marking and textual description
+will automatically place the metronome marking within parentheses:
+
+@lilypond[verbatim,quote,relative=2]
+\tempo "Allegro" 4 = 160
+g4 c d e
+@end lilypond
 
-@lilypond[quote,ragged-right,verbatim,fragment]
-\tempo 8.=120 c''1
+To write a metronome marking in parentheses without the text,
+include an empty string in the input:
+
+@lilypond[verbatim,quote,relative=2]
+\tempo "" 8 = 96
+d4 g e c
 @end lilypond
 
 
 @snippets
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{printing-metronome-and-rehearsal-marks-below-the-staff.ly}
+
+@c perhaps also an example of how to move it horizontally?
+
+@c TODO add snippet to LSR -pm
 To change the tempo in the MIDI output without printing anything,
-make the metronome marking invisible @example \once \override
-Score.MetronomeMark #'transparent = ##t @end example
+make the metronome marking invisible
 
+@example
+\once \override Score.MetronomeMark #'transparent = ##t
+@end example
+
+@c TODO add snippet to LSR -pm
 To print other metronome markings, use these markup commands
-@lilypond[quote,ragged-right,verbatim,relative,fragment]
+
+@lilypond[verbatim,quote,relative=1]
 c4^\markup {
   (
   \smaller \general-align #Y #DOWN \note #"16." #1
@@ -813,122 +875,117 @@ c4^\markup {
   ) }
 @end lilypond
 
-@noindent
 For more details, see @ref{Formatting text}.
 
 
 @seealso
 
-Music Glossary: @rglos{metronome}, @rglos{metronomic indication},
-@rglos{tempo indication}, @rglos{metronome mark}.
+Music Glossary:
+@rglos{metronome},
+@rglos{metronomic indication},
+@rglos{tempo indication},
+@rglos{metronome mark}.
 
-Notation Reference: @ref{Formatting text}.
+Notation Reference:
+@ref{Formatting text},
+@ref{MIDI output}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{MetronomeMark}, @ref{MIDI
-output}.
-
-
-@knownissues
-
-Collisions are not checked.  If you have notes above the top line
-of the staff (or notes with articulations, slurs, text, etc), then
-the metronome marking may be printed on top of musical symbols.
-If this occurs, increase the padding of the metronome mark to
-place it further away from the staff.
-
-@example
-\override Score.MetronomeMark #'padding = #2.5
-@end example
-
-@c perhaps also an example of how to move it horizontally?
+Internals Reference:
+@rinternals{MetronomeMark}.
 
 
 @node Instrument names
-@subsubsection Instrument names
+@unnumberedsubsubsec Instrument names
 
 @cindex instrument names
 @cindex instrument names, short
 
-In an orchestral score, instrument names are printed at the left
-side of the staves.
+Instrument names can be printed on the left side of staves for the
+@code{Staff} and @code{PianoStaff} contexts.  The value of
+@code{instrumentName} is used for the first staff, and the value
+of @code{shortInstrumentName} is used for all succeeding staves.
 
-This can be achieved by setting @code{Staff}.@code{instrumentName} and
-@code{Staff}.@code{shortInstrumentName}, or
-@code{PianoStaff}.@code{instrumentName} and
-@code{PianoStaff}.@code{shortInstrumentName}.  This will print text
-before the start of the staff.  For the first staff,
-@code{instrumentName} is used.  If set, @code{shortInstrumentName} is
-used for the following staves.
-
-@lilypond[quote,verbatim,ragged-right,relative=1,fragment]
-\set Staff.instrumentName = "Ploink "
-\set Staff.shortInstrumentName = "Plk "
+@lilypond[verbatim,quote,ragged-right,relative=1]
+\set Staff.instrumentName = "Violin "
+\set Staff.shortInstrumentName = "Vln "
 c1
 \break
-c''
+c''1
 @end lilypond
 
-You can also use markup texts to construct more complicated
-instrument names, for example
+Markup mode can be used to create more complicated instrument
+names:
 
-@lilypond[quote,fragment,verbatim,ragged-right]
+@lilypond[verbatim,quote,relative=2]
 \set Staff.instrumentName = \markup {
   \column { "Clarinetti"
             \line { "in B" \smaller \flat } } }
-c''1
+c1
 @end lilypond
 
 @cindex instrument names, centering
 
-As instrument names are centered by default, multi line names
-are better entered using @code{\center-align}:
+When two or more staff contexts are grouped together, the
+instrument names and short instrument names are centered by
+default.  To center multi-line instrument names,
+@code{\center-align} must be used:
 
-@lilypond[quote,verbatim,ragged-right]
-{ <<
-\new Staff {
-  \set Staff.instrumentName = \markup \center-align {
-    Clarinetti
-    \line { "in B" \smaller \flat }
+@lilypond[verbatim,quote,relative=2]
+<<
+  \new Staff {
+    \set Staff.instrumentName = \markup \center-align {
+      Clarinetti
+      \line { "in B" \smaller \flat }
+    }
+    c1
+  }
+  \new Staff {
+    \set Staff.instrumentName = "Vibraphone"
+    c1
   }
-  c''1
-}
-\new Staff {
-  \set Staff.instrumentName = "Vibraphone"
-  c''1
-}
 >>
-}
 @end lilypond
 
-For longer instrument names, it may be useful to increase the
-@code{indent} setting in the @code{\layout} block.
+@cindex indent
+@cindex short-indent
 
-Short instrument names, printed before the systems following the first
-one, are also centered by default, in a space which width is given by
-the @code{short-indent} variable of the @code{\layout} block.
+The @code{indent} and @code{short-indent} settings specify the
+level of indentation for the first system and all succeeding
+systems, respectively.  They can be modified in the @code{\layout}
+block.  For longer instrument names or short instrument names, it
+may be useful to increase the @code{indent} and
+@code{short-indent} settings:
 
-To add instrument names to other contexts (such as
-@code{GrandStaff}, @code{ChoirStaff}, or @code{StaffGroup}), the
-engraver must be added to that context.
+@lilypond[verbatim,quote]
+\relative c' <<
+  \new Staff \with {
+    instrumentName = "Oboe"
+  }
+  { c2 d }
+  \new Staff \with {
+    instrumentName = "Glockenspiel"
+  }
+  { c'2 d }
+>>
 
-@example
-\layout@{
-  \context @{\GrandStaff \consists "Instrument_name_engraver"@}
-@}
-@end example
+\layout {
+  indent = 2.5\cm
+}
+@end lilypond
 
-@noindent
-More information about adding and removing engravers can be found
-in @ref{Modifying context plug-ins}.
+To add instrument names to other contexts (such as
+@code{GrandStaff}, @code{ChoirStaff}, or @code{StaffGroup}),
+@code{Instrument_name_engraver} must be added to that context.
+For details, see @ref{Modifying context plug-ins}.
 
 @cindex instrument names, changing
 
-Instrument names may be changed in the middle of a piece,
+Instrument names may be changed in the middle of a piece:
 
-@lilypond[quote,fragment,verbatim,ragged-right]
+@lilypond[verbatim,quote,ragged-right,relative=1]
 \set Staff.instrumentName = "First"
 \set Staff.shortInstrumentName = "one"
 c1 c c c \break
@@ -940,119 +997,140 @@ c1 c c c \break
 @end lilypond
 
 
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{aligning-and-centering-instrument-names.ly}
+
+
 @seealso
 
-Notation Reference: @ref{Modifying context plug-ins}.
+Notation Reference:
+@ref{Modifying context plug-ins}.
 
 Snippets:
-@lsrdir{Staff,Staff-notation}
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{InstrumentName},
-@internalsref{PianoStaff}, @internalsref{Staff}.
+Internals Reference:
+@rinternals{InstrumentName},
+@rinternals{PianoStaff},
+@rinternals{Staff}.
 
 
 @node Quoting other voices
-@subsubsection Quoting other voices
+@unnumberedsubsubsec Quoting other voices
 
 @cindex cues
 @cindex quoting other voices
 @cindex fragments
 @cindex cue notes
 
-With quotations, fragments of other parts can be inserted into a
-part directly.  Before a part can be quoted, it must be marked
-especially as quotable.  This is done with the @code{\addQuote}
-command.
+Quotations allow fragments of other parts to be inserted directly
+into a music expression.  Before a part can be quoted, the
+@code{\addQuote} command must be used to initialize the quoted
+fragment.  This command must be used in the toplevel scope.  The
+first argument is an identifying string, and the second is a music
+expression:
 
 @example
-\addQuote @var{name} @var{music}
-@end example
-
-
-@noindent
-Here, @var{name} is an identifying string.  The @var{music} is any
-kind of music.  Here is an example of @code{\addQuote}
-
-@example
-\addQuote clarinet \relative c' @{
+flute = \relative c' @{
   f4 fis g gis
 @}
+\addQuote "flute" @{ \flute @}
 @end example
 
-This command must be entered at toplevel, i.e., outside any music
-blocks.  Typically, one would use an already defined music event
-as the @var{music}:
+The @code{\quoteDuring} command may then be used to indicate when
+the quotation should take place.  The corresponding measures from
+the quotation are inserted into the music expression.  The syntax
+is similar to @code{\addQuote}:
 
-@example
-clarinet = \relative c' @{
+@lilypond[verbatim,quote]
+flute = \relative c' {
   f4 fis g gis
-@}
-\addQuote clarinet @{ \clarinet @}
-@end example
-
-
-After calling @code{\addQuote}, the quotation may then be done
-with @code{\quoteDuring} or @code{\cueDuring},
-
-@example
-\quoteDuring #@var{name} @var{music}
-@end example
-
-During a part, a piece of music can be quoted with the
-@code{\quoteDuring} command.
+}
+\addQuote "flute" { \flute }
 
-@example
-\quoteDuring #"clarinet" @{ s2. @}
-@end example
+\relative c' {
+  c4 cis \quoteDuring #"flute" { s2 }
+}
+@end lilypond
 
-This would cite three quarter notes (the duration of @code{s2.})
-of the previously added @code{clarinet} voice.
+If the music expression used for @code{\quoteDuring} contains
+anything but a spacer rest or multi-measure rest, a polyphonic
+situation is created, which is often not desirable:
 
-More precisely, it takes the current time-step of the part being
-printed, and extracts the notes at the corresponding point of the
-@code{\addQuote}d voice.  Therefore, the argument to
-@code{\addQuote} should be the entire part of the voice to be
-quoted, including any rests at the beginning.
+@lilypond[verbatim,quote]
+flute = \relative c' {
+  f4 fis g gis
+}
+\addQuote "flute" { \flute }
 
-It is possible to use another music expression instead of
-@code{s}, thus creating a polyphonic section, but this may not
-always give the desired result.
+\relative c' {
+  c4 cis \quoteDuring #"flute" { c4 b }
+}
+@end lilypond
 
-Quotations take into account the transposition of both source and
-target instruments, if they are specified using the
-@code{\transposition} command.
+Quotations recognize instrument transposition settings for both
+the source and target instruments if they are specified using the
+@code{\transposition} command:
 
-@lilypond[quote,ragged-right,verbatim]
-\addQuote clarinet \relative c' {
+@lilypond[verbatim,quote]
+clarinet = \relative c' {
   \transposition bes
   f4 fis g gis
 }
+\addQuote "clarinet" { \clarinet }
 
-{
-  e'8 f'8 \quoteDuring #"clarinet" { s2 }
+\relative c' {
+  c4 cis \quoteDuring #"clarinet" { s2 }
 }
 @end lilypond
 
-The type of events that are present in the quoted music can be
-trimmed with the @code{quotedEventTypes} property.  The default
-value is @code{(note-event rest-event)}, which means that only
-notes and rests of the quoted voice end up in the
-@code{\quoteDuring}.  Setting
+@c add to snippets, possibly.  It might already be there.  -pm
+@c
+@c The type of events that are present in the quoted music can be
+@c trimmed with the @code{quotedEventTypes} property.  The default
+@c value is @code{(note-event rest-event)}, which means that only
+@c notes and rests of the quoted voice end up in the
+@c @code{\quoteDuring}.  Setting
+@c
+@c @example
+@c \set Staff.quotedEventTypes =
+@c        #'(note-event articulation-event dynamic-event)
+@c @end example
+@c
+@c @noindent
+@c will quote notes (but no rests), together with scripts and
+@c dynamics.
 
-@example
-\set Staff.quotedEventTypes =
-       #'(note-event articulation-event dynamic-event)
-@end example
 
-@noindent
-will quote notes (but no rests), together with scripts and
-dynamics.
+@snippets
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{quoting-another-voice-with-transposition.ly}
+
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{quoting-another-voice.ly}
+
+
+@seealso
+
+Notation Reference:
+@ref{Instrument transpositions}.
+
+Snippets:
+@rlsr{Staff notation}.
+
+Internals Reference:
+@rinternals{QuoteMusic},
+@rinternals{Voice}.
+
 
 @knownissues
 
 Only the contents of the first @code{Voice} occurring in an
 @code{\addQuote} command will be considered for quotation, so
-@var{music} can not contain @code{\new} and @code{\context Voice}
+@var{music} cannot contain @code{\new} and @code{\context Voice}
 statements that would switch to a different Voice.
 
 Quoting grace notes is broken and can even cause LilyPond to
@@ -1063,87 +1141,64 @@ Quoting nested triplets may result in poor notation.
 In earlier versions of LilyPond (pre 2.11), @code{addQuote} was
 written entirely in lower-case letters: @code{\addquote}.
 
-@seealso
-
-Notation Reference: @ref{Instrument transpositions}.
-
-Snippets:
-@lsrdir{Staff,Staff-notation}
-
-Internals Reference: @internalsref{QuoteMusic}, @internalsref{Voice}.
-
 
 @node Formatting cue notes
-@subsubsection Formatting cue notes
+@unnumberedsubsubsec Formatting cue notes
 
 @cindex cues
 @cindex cue notes
 @cindex cue notes, formatting
 @cindex fragments
-@cindex quoting other voices 
+@cindex quoting other voices
 @cindex cues, formatting
 
-The previous section deals with inserting notes from another
-voice.  There is a more advanced music function called
-@code{\cueDuring}, which makes formatting cue notes easier.
-
-The syntax is
+The previous section explains how to quote other voices.  The
+@code{\cueDuring} command is a more specialized form of
+@code{\quoteDuring}, being particularly useful for inserting cue
+notes into a part.  The syntax is as follows:
 
 @example
-  \cueDuring #@var{name} #@var{updown} @var{music}
+  \cueDuring #@var{partname} #@var{voice} @var{music}
 @end example
 
-This will insert notes from the part @var{name} into a
-@code{Voice} called @code{cue}.  This happens
-simultaneously with @var{music}, which usually is a rest.  When
-the cue notes start, the staff in effect becomes polyphonic for a
-moment.  The argument @var{updown} determines whether the cue
-notes should be notated as a first or second voice.
-
-
-@lilypond[verbatim,ragged-right]
-smaller = {
-  \set fontSize = #-2
-  \override Stem #'length-fraction = #0.8
-  \override Beam #'thickness = #0.384
-  \override Beam #'length-fraction = #0.8
+This command copies the corresponding measures from @var{partname}
+into a @code{CueVoice} context.  The @code{CueVoice} is created
+implicitly, and occurs simultaneously with @var{music}, which
+creates a polyphonic situation.  The @var{voice} argument
+determines whether the cue notes should be notated as a first or
+second voice; @code{DOWN} corresponds to the first voice, and
+@code{UP} corresponds to the second.
+
+@lilypond[verbatim,quote]
+oboe = \relative c'' {
+  r2 r8 d16 f e g f a
+  g8 g16 g g2.
 }
+\addQuote "oboe" { \oboe }
 
-\addQuote clarinet \relative {
-  R1*20
-  r2 r8 c' f f
+\new Voice \relative c'' {
+  \cueDuring #"oboe" #UP { R1 }
+  g2 c,
 }
-
-\new Staff \relative  <<
-
-  % setup a context for cue notes.
-  \new Voice = "cue" { \smaller \skip 1*21 }
-
-  \set Score.skipBars = ##t
-
-  \new Voice {
-    R1*20
-    \cueDuring #"clarinet" #UP {
-      R1
-    }
-    g4 g2.
-  }
->>
 @end lilypond
 
+In the above example, the @code{Voice} context had to be
+explicitly declared, or else the entire music expression would
+belong to the @code{CueVoice} context.
 
-Here are a couple of hints for successful cue notes:
+@c TODO document \killCues
+@c TODO document instrumentCueName context property
 
-@itemize
-@item
-Cue notes have smaller font sizes.
+When typesetting cue notes, some guidelines should be followed:
 
+@itemize
 @item
-The cued part is marked with the instrument playing the cue.
+The instrument playing the cue should be clearly marked on the
+score.
 
 @item
-When the original part takes over again, this should be marked
-with the name of the original instrument.
+When the cue notes end, the name of the original instrument should
+be indicated.
 
 @item
 Any other changes introduced by the cued part should also be
@@ -1152,38 +1207,43 @@ clef, the original clef should be stated once again.
 
 @end itemize
 
-The macro @code{\transposedCueDuring} is useful to add cues to
-instruments which use a completely different octave range (for
-example, having a cue of a piccolo flute within a contra bassoon
-part).
+The @code{\transposedCueDuring} command is useful to add cues for
+instruments in a completely different register.  Having piccolo
+cues within a contrabassoon part is a good example.
 
-@lilypond[verbatim,ragged-right,quote]
-picc = \relative c''' {
+@lilypond[verbatim,quote]
+piccolo = \relative c''' {
   \clef "treble^8"
-  R1 |
-  c8 c c e g2 |
-  a4 g g2 |
+  R1
+  c8 c c e g2
+  a4 g g2
 }
-\addQuote "picc" { \picc }
+\addQuote "piccolo" { \piccolo }
 
-cbsn = \relative c, {
+cbassoon = \relative c, {
   \clef "bass_8"
   c4 r g r
-  \transposedCueDuring #"picc" #UP c,, { R1 } |
-  c4 r g r |
+  \transposedCueDuring #"piccolo" #UP c,, { R1 }
+  c4 r g r
 }
 
 <<
-  \context Staff = "picc" \picc
-  \context Staff = "cbsn" \cbsn
+  \new Staff = "piccolo" \piccolo
+  \new Staff = "cbassoon" \cbassoon
 >>
 @end lilypond
 
+
 @seealso
 
 Snippets:
-@lsrdir{Staff,Staff-notation}
+@rlsr{Staff notation}.
 
-Internals Reference: @internalsref{Voice}.
+Internals Reference:
+@rinternals{Voice}.
 
 
+@knownissues
+
+Collisions are not checked between @code{Voice} and
+@code{CueVoice} contexts.