Update from Francisco.

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 0de5874d02f7a87337c0f32337db9679496b83e0..b4b69b52a674a349d20521358dc933d18e0e2a27 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -166,7 +166,9 @@ separated by double backslashes.
 
 First and third voices get stems up, second and fourth voices get
 stems down, third and fourth voice noteheads are horizontally shifted,
 
 First and third voices get stems up, second and fourth voices get
 stems down, third and fourth voice noteheads are horizontally shifted,

-and rests move to avoid collisions.
+and rests move to avoid collisions.  In the following example, the
+intermediate voice has stems up, therefore we enter it in the third
+place, so it becomes voice three which has the stems up as desired.

 
 @lilypond[quote,relative=3,verbatim]
 <<
 
 @lilypond[quote,relative=3,verbatim]
 <<


@@ -178,9 +180,23 @@ and rests move to avoid collisions.
 >>
 @end lilypond
 
 >>
 @end lilypond
 

-For these purposes, the @code{\voiceOne} ... @code{\voiceFour}
-commands can be used instead.  Spacing rests are often used to avoid
-too many rests, as seen in the example avobe.
+Spacing rests are often used to avoid too many rests, as seen in the
+example above.
+
+The method exposed creates two new voices when the @code{<<@{...@} \\
+@{...@}>>} construction is found in the code; to temporally add only
+one additional voice to an existing one, it is necessary to
+instantiate that voice explicitly. For these purposes, the
+@code{\voiceOne} ... @code{\voiceFour}, and @code{\oneVoice} commands
+can be used:
+
+@example
+<< @{ \voiceOne ... @} \new Voice @{ \voiceTwo ... @} >> \oneVoice
+@end example
+
+This is a better construction to keep the control of the voices, for
+example, to ease a consistent assign of lyrics to the proper voice
+context.

 
 @predefined
 
 
 @predefined
 


@@ -191,12 +207,18 @@ too many rests, as seen in the example avobe.
 @funindex \voiceThree
 @code{\voiceThree},
 @funindex \voiceFour
 @funindex \voiceThree
 @code{\voiceThree},
 @funindex \voiceFour

-@code{\voiceFour}.
+@code{\voiceFour},
+@funindex \oneVoice
+@code{\oneVoice}.

 
 @seealso
 
 Learning Manual:
 
 @seealso
 
 Learning Manual:

-@rlearning{Voices contain music}.
+@rlearning{Voices contain music},
+@rlearning{Explicitly instantiating voices}.
+
+Notation Reference:
+@ref{Percussion staves}.

 
 Snippets:
 @rlsr{Simultaneous notes}.
 
 Snippets:
 @rlsr{Simultaneous notes}.


@@ -378,9 +400,6 @@ Notes are only merged if they have opposing stem directions (i.e., in
 @funindex \mergeDifferentlyHeadedOff
 @code{\mergeDifferentlyHeadedOff}.
 
 @funindex \mergeDifferentlyHeadedOff
 @code{\mergeDifferentlyHeadedOff}.
 

-@funindex \oneVoice
-@code{\oneVoice}.
-

 @funindex \shiftOn
 @code{\shiftOn},
 @funindex \shiftOnn
 @funindex \shiftOn
 @code{\shiftOn},
 @funindex \shiftOnn