Update from Francisco.

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index a9f4d88ed9c65fb7720caab326a248dafbea3938..3d47d4ca69b9e4da9b775f3a9c38deda5e272ab6 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -231,22 +231,6 @@ Notes are only merged if they have opposing stem directions (i.e., in
 @cindex polyphonic music
 @cindex shifting voices
 
-In some instances of complex polyphonic music, you may need
-additional voices to avoid collisions between notes.  Additional
-voices are added by defining an variable, as shown below:
-
-@lilypond[quote,verbatim]
-voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
-\relative c'''
-<< 
-  { \voiceOne g2. ~ \stemDown g32[ f( es d c b a b64) g] } \\
-  { \voiceThree b4 } \\
-  { \voiceFive d,  } \\
-  { \voiceTwo g,   }
->>
-@end lilypond
-
-
 @predefined
 
 @funindex \oneVoice
@@ -260,7 +244,6 @@ voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 @funindex \voiceFour
 @code{\voiceFour}.
 
-@c undocumented?: --FV
 @funindex \voiceNeutralStyle
 @funindex \voiceOneStyle
 @funindex \voiceTwoStyle
@@ -288,21 +271,13 @@ inner voices (three and four) have @code{\shiftOn}.
 @code{\shiftOnn} and @code{\shiftOnnn} define further shift
 levels.
 
-When LilyPond cannot cope, the @code{force-hshift} property of the
-@code{NoteColumn} object and pitched rests can be used to
-override typesetting decisions.
+@snippets
 
-@lilypond[quote,verbatim,relative=1]
-<<
-  { <d g>2
-    <d g>  }
-  \\
-  { <b f'>2
-    \once \override NoteColumn #'force-hshift = #1.7
-    <b f'> }
->>
-@end lilypond
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{additional-voices-to-avoid-collisions.ly}
 
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{forcing-horizontal-shift-of-notes.ly}
 
 @seealso
 
@@ -477,7 +452,7 @@ when the parts can be combined.  Consequently, if the arguments
 switch to differently named @rinternals{Voice} contexts, the
 events in those will be ignored.
 
-@c IIRC in users list someone pointed out more issues. FV
+@c IIRC in users list someone pointed out more issues. TODO: lookup FV
 
 @node Writing music in parallel
 @subsubsection Writing music in parallel