Doc-de: updates for notation manual

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

diff --git a/Documentation/notation/simultaneous.itely b/Documentation/notation/simultaneous.itely
index b59bdbb8e204f55afb11a08934e4c7a31fdb73f2..e73eab867ffe7c7d18c32bd7bef05b572e2c7129 100644 (file)
--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -133,6 +133,9 @@ enharmonic transcription of one or more pitches,
 @node Chord repetition
 @unnumberedsubsubsec Chord repetition
 
+@cindex Chord, repetition
+@cindex repetition, using @code{q}
+
 In order to save typing, a shortcut can be used to repeat the preceding
 chord.  The chord repetition symbol is @code{q}:
 
@@ -209,6 +212,28 @@ generate multiple staves implicitly:
 
 Here different rhythms cause no problems.
 
+@cindex collisions, clashing note columns
+@cindex collisions, ignoring
+
+@knownissues
+If notes from two or more voices, with stems in the same direction, are
+placed at the same position on the staff and have no shift (or have the
+same shift specified), the message:
+
+@example
+warning: ignoring too many clashing note columns
+@end example
+
+will appear during compilation.  This message can be suppressed by:
+
+@example
+\override NoteColumn #'ignore-collision = ##t
+@end example
+
+However, this not only suppresses the warning but will prevent any
+collision resolution whatsover and may have other unintended effects
+(also see @emph{Known Issues} in @ref{Collision resolution}).
+
 
 @node Clusters
 @unnumberedsubsubsec Clusters
@@ -304,7 +329,7 @@ voices in a single staff is illustrated in the following example:
 
 @noindent
 Here, voices are instantiated explicitly and are given names.  The
-@code{\voiceOne} ... @code{\voiceFour} commands set up the voices
+@code{\voiceOne} @dots{} @code{\voiceFour} commands set up the voices
 so that first and third voices get stems up, second and fourth
 voices get stems down, third and fourth voice note heads are
 horizontally shifted, and rests in the respective voices are
@@ -382,7 +407,7 @@ The first example could be typeset as follows:
 This syntax can be used where it does not matter that temporary
 voices are created and then discarded.  These implicitly created
 voices are given the settings equivalent to the effect of the
-@code{\voiceOne} ... @code{\voiceFour} commands, in the order in
+@code{\voiceOne} @dots{} @code{\voiceFour} commands, in the order in
 which they appear in the code.
 
 In the following example, the intermediate voice has stems up,
@@ -626,7 +651,6 @@ also be merged:
 >>
 @end lilypond
 
-
 The half note and eighth note at the start of the second measure
 are incorrectly merged because the automatic merge cannot
 successfully complete the merge when three or more notes line up in
@@ -709,7 +733,6 @@ Notes are only merged if they have opposing stem directions (as
 they have, for example, in voices one and two by default or when
 the stems are explicitly set in opposite directions).
 
-
 @predefined
 @code{\mergeDifferentlyDottedOn},
 @code{\mergeDifferentlyDottedOff},
@@ -722,16 +745,13 @@ the stems are explicitly set in opposite directions).
 @code{\shiftOff}.
 @endpredefined
 
-
 @snippets
-
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {additional-voices-to-avoid-collisions.ly}
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {forcing-horizontal-shift-of-notes.ly}
 
-
 @seealso
 Music Glossary:
 @rglos{polyphony}.
@@ -749,6 +769,18 @@ Internals Reference:
 @rinternals{NoteCollision},
 @rinternals{RestCollision}.
 
+@cindex collisions, ignoring
+
+@knownissues
+Using @code{\override NoteColumn #'ignore-collision = ##t} will cause
+differently headed notes in different voices to merge incorrectly.
+
+@lilypond[quote,relative=1,verbatim]
+\mergeDifferentlyHeadedOn
+<< { c16 a' b a } \\ { c,2 } >>
+\override NoteColumn #'ignore-collision = ##t
+<< { c16 a' b a } \\ { c,2 } >>
+@end lilypond
 
 @ignore
 @knownissues
@@ -917,10 +949,10 @@ instrumentTwo = \relative c' {
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {combining-two-parts-on-the-same-staff.ly}
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {changing-partcombine-texts.ly}