Merge branch 'master' of git://git.sv.gnu.org/lilypond.git into td-lily

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

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index f630fa8bf38dbf348923cfa949ef709f2a02300f..897cd9aa54c3d505456bb2562e913bac0650a81b 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -6,11 +6,12 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.38"
+
 @node Simultaneous notes
 @section Simultaneous notes
 
-@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
-{simultaneous-headword.ly}
+@lilypondfile[quote]{simultaneous-headword.ly}
 
 Polyphony in music refers to having more than one voice occurring
 in a piece of music.  Polyphony in LilyPond refers to having more
@@ -31,7 +32,7 @@ than one voice on the same staff.
 @end menu
 
 @node Chorded notes
-@unnumberedsubsubsec Chorded notes
+@subsubsection Chorded notes
 
 @cindex Chords
 
@@ -48,9 +49,13 @@ names}.
 
 @seealso
 
-Snippets: @lsrdir{simultaneous}
+Music Glossary: @rglos{chord}.
+
+Notation Reference: @ref{Introducing chord names}.
+
+Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
 
-@refbugs
+@knownissues
 
 Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
 accurately.  Use @code{<g a>8 <e a>8} instead.
@@ -58,7 +63,7 @@ accurately.  Use @code{<g a>8 <e a>8} instead.
 
 
 @node Clusters
-@unnumberedsubsubsec Clusters
+@subsubsection Clusters
 
 @cindex cluster
 
@@ -78,13 +83,13 @@ clusters.
 
 @seealso
 
-Snippets: @lsrdir{simultaneous}
+Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
 
 Internals Reference: @internalsref{ClusterSpanner},
 @internalsref{ClusterSpannerBeacon},
 @internalsref{Cluster_spanner_engraver}.
 
-Examples: @lsr{contemporary,cluster@/.ly}.
+Examples: @c @lsr{contemporary,cluster@/.ly}.
 
 
 
@@ -98,9 +103,10 @@ Examples: @lsr{contemporary,cluster@/.ly}.
 @end menu
 
 @node Collision resolution
-@unnumberedsubsubsec Collision resolution
+@subsubsection Collision resolution
 
-@cindex Merging noteheads
+@cindex merging notes
+@cindex note collisions
 
 Normally, note heads with a different number of dots are not
 merged, but when the object property
@@ -130,7 +136,7 @@ c8 c4. } \\ { c2 c2 } >>
 @noindent
 @code{merge-differently-headed} and
 @code{merge-differently-dotted} only apply to opposing stem
-directions (ie. Voice 1 & 2).
+directions (i.e. Voice 1 & 2).
 
 LilyPond also vertically shifts rests that are opposite of a stem,
 for example
@@ -139,6 +145,8 @@ for example
 \new Voice << c''4 \\ r4 >>
 @end lilypond
 
+@cindex shift note
+
 If three or more notes line up in the same column,
 @code{merge-differently-headed} cannot successfully complete the
 merge of the two notes that should be merged.  To allow the merge
@@ -163,6 +171,10 @@ move the top @code{g} out of the column, and
 >>
 @end lilypond
 
+@cindex multiple voices
+@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:
@@ -180,7 +192,7 @@ voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 
 
 
-@refcommands
+@predefined
 
 @funindex \oneVoice
 @code{\oneVoice},
@@ -239,14 +251,14 @@ override typesetting decisions.
 
 @seealso
 
-Snippets: @lsrdir{simultaneous}
+Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
 
 Internals Reference: the objects responsible for resolving
 collisions are @internalsref{NoteCollision} and
 @internalsref{RestCollision}.
 
 
-@refbugs
+@knownissues
 
 When using @code{merge-differently-headed} with an upstem eighth
 or a shorter note, and a downstem half note, the eighth note gets
@@ -259,9 +271,10 @@ cluster notation (see @ref{Clusters}).
 
 
 @node Automatic part combining
-@unnumberedsubsubsec Automatic part combining
+@subsubsection Automatic part combining
 @cindex automatic part combining
 @cindex part combiner
+@cindex combining parts
 
 Automatic part combining is used to merge two parts of music onto
 a staff.  It is aimed at typesetting orchestral scores.  When the
@@ -279,7 +292,7 @@ The syntax for part combining is
 
 The following example demonstrates the basic functionality of the
 part combiner: putting parts on one staff, and setting stem
-directions and polyphony
+directions and polyphony.
 
 @lilypond[quote,verbatim,ragged-right,fragment]
 \new Staff \partcombine
@@ -295,7 +308,7 @@ and @q{Solo}, while the second (called @code{two}) always gets
 down stems and @q{Solo II}.
 
 If you just want the merging parts, and not the textual markings,
-you may set the property @code{printPartCombineTexts} to false
+you may set the property @code{printPartCombineTexts} to false.
 
 @lilypond[quote,verbatim,ragged-right,fragment,relative=2]
 \new Staff <<
@@ -339,13 +352,15 @@ has no effect on the pitches of @var{musicexpr1} and
 
 @seealso
 
-Snippets: @lsrdir{simultaneous}
+Music Glossary: @rglos{a due}.
+
+Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
 
-Internals Reference: @internalsref{PartCombineMusic}.
+Internals Reference: @internalsref{PartCombineMusic}, @internalsref{Voice}.
 
-@refbugs
+@knownissues
 
-When @code{printPartCombineTexts} is set, when the two voices play
+When @code{printPartCombineTexts} is set, if the two voices play
 the same notes on and off, the part combiner may typeset @code{a2}
 more than once in a measure.
 
@@ -361,12 +376,12 @@ events in those will be ignored.
 
 
 @node Writing music in parallel
-@unnumberedsubsubsec Writing music in parallel
+@subsubsection Writing music in parallel
 
 @cindex Writing music in parallel
 @cindex Interleaved music
 
-Music for multiple parts can be interleaved
+Music for multiple parts can be interleaved:
 
 @lilypond[quote,fragment,verbatim]
 \parallelMusic #'(voiceA voiceB) {
@@ -381,7 +396,7 @@ Music for multiple parts can be interleaved
 >>
 @end lilypond
 
-This works quite well for piano music
+This works quite well for piano music.
 
 @c  It would be nice if the first bar fit onto one 66-char line.
 @c  Maybe simplify the example?  -gp
@@ -430,5 +445,5 @@ music = {
 
 @seealso
 
-Snippets: @lsrdir{simultaneous}
+Snippets: @lsrdir{Simultaneous,Simultaneous-notes}